delete has no more data after the key (#53886)

t-vi · facebook-github-bot · commit 8734e88f0b77 · 2021-03-15T08:44:55.000-07:00
Summary: The tcpstore delete key implementation inadvertendly set "moreData" when sending the key when it was in fact the last message. Thank you, PetrochukM, for the reproducing example which was instrumental in developing the fix (and is the blueprint for the test case). Fixes #53872 Pull Request resolved: #53886 Reviewed By: jbschlosser Differential Revision: D27011846 Pulled By: H-Huang fbshipit-source-id: 5c460d1e4d095a8bc267bf63613b556856ced3e8
diff --git a/torch/lib/c10d/TCPStore.cpp b/torch/lib/c10d/TCPStore.cpp
@@ -511,7 +511,7 @@ int64_t TCPStore::add(const std::string& key, int64_t value) {
 bool TCPStore::deleteKey(const std::string& key) {
   std::string regKey = regularPrefix_ + key;
   tcputil::sendValue<QueryType>(storeSocket_, QueryType::DELETE_KEY);
-  tcputil::sendString(storeSocket_, regKey, true);
+  tcputil::sendString(storeSocket_, regKey);
   auto numDeleted = tcputil::recvValue<int64_t>(storeSocket_);
   return (numDeleted == 1);
 }

Original file line number	Diff line number	Diff line change
`@@ -511,7 +511,7 @@ int64_t TCPStore::add(const std::string& key, int64_t value) {`
`511`	`511`	`bool TCPStore::deleteKey(const std::string& key) {`
`512`	`512`	`std::string regKey = regularPrefix_ + key;`
`513`	`513`	`tcputil::sendValue<QueryType>(storeSocket_, QueryType::DELETE_KEY);`
`514`		`- tcputil::sendString(storeSocket_, regKey, true);`
	`514`	`+ tcputil::sendString(storeSocket_, regKey);`
`515`	`515`	`auto numDeleted = tcputil::recvValue<int64_t>(storeSocket_);`
`516`	`516`	`return (numDeleted == 1);`
`517`	`517`	`}`