1 files changed, 1 insertions, 6 deletions
diff --git a/storage/src/vespa/storage/distributor/pendingclusterstate.cpp b/storage/src/vespa/storage/distributor/pendingclusterstate.cpp
index 471ce7e2b27..1996ae9d2af 100644
--- a/storage/src/vespa/storage/distributor/pendingclusterstate.cpp
+++ b/storage/src/vespa/storage/distributor/pendingclusterstate.cpp
@@ -233,12 +233,7 @@ PendingClusterState::onRequestBucketInfoReply(const std::shared_ptr<api::Request
     const BucketSpaceAndNode bucketSpaceAndNode = iter->second;
 
     api::ReturnCode result(reply->getResult());
-    if (result == api::ReturnCode::Result::ENCODE_ERROR) {
-        // Handle failure to encode bucket space due to use of old storage api
-        // protocol.  Pretend that request succeeded with no buckets returned.
-        // TODO remove this workaround for Vespa 7
-        LOG(debug, "Got ENCODE_ERROR, pretending success with no buckets");
-    } else if (!result.success()) {
+    if (!result.success()) {
         framework::MilliSecTime resendTime(_clock);
         resendTime += framework::MilliSecTime(100);
         _delayedRequests.emplace_back(resendTime, bucketSpaceAndNode);