Handle rolling upgrade where some storage nodes use old storage api protocol

while some distributor nodes tracks multiple bucket spaces.

2 files changed, 7 insertions, 1 deletions

diff --git a/storage/src/vespa/storage/distributor/pendingclusterstate.cpp b/storage/src/vespa/storage/distributor/pendingclusterstate.cpp
index 51ef710d316..d5d105c862b 100644
--- a/storage/src/vespa/storage/distributor/pendingclusterstate.cpp
+++ b/storage/src/vespa/storage/distributor/pendingclusterstate.cpp
@@ -232,7 +232,12 @@ PendingClusterState::onRequestBucketInfoReply(const std::shared_ptr<api::Request
     }
     const BucketSpaceAndNode bucketSpaceAndNode = iter->second;
 
-    if (!reply->getResult().success()) {
+    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.
+        LOG(debug, "Got ENCODE_ERROR, pretending success with no buckets");
+    } else if (!result.success()) {
         framework::MilliSecTime resendTime(_clock);
         resendTime += framework::MilliSecTime(100);
         _delayedRequests.emplace_back(resendTime, bucketSpaceAndNode);
diff --git a/storageapi/src/vespa/storageapi/messageapi/returncode.h b/storageapi/src/vespa/storageapi/messageapi/returncode.h
index af4f14c1eeb..78f2168e170 100644
--- a/storageapi/src/vespa/storageapi/messageapi/returncode.h
+++ b/storageapi/src/vespa/storageapi/messageapi/returncode.h
@@ -30,6 +30,7 @@ public:
     /** Return status codes */
     enum Result {
         OK                            = mbus::ErrorCode::NONE,
+        ENCODE_ERROR                  = mbus::ErrorCode::ENCODE_ERROR,
 
         EXISTS                        = Protocol::ERROR_EXISTS,