SERVER-50853 Enable retries of getShardAndCollectionVersion on the config server

1 files changed, 8 insertions, 6 deletions

diff --git a/src/mongo/db/s/config/sharding_catalog_manager_chunk_operations.cpp b/src/mongo/db/s/config/sharding_catalog_manager_chunk_operations.cpp
index 3e2b4e0f8c7..2d40f65eaed 100644
--- a/src/mongo/db/s/config/sharding_catalog_manager_chunk_operations.cpp
+++ b/src/mongo/db/s/config/sharding_catalog_manager_chunk_operations.cpp
@@ -335,12 +335,14 @@ BSONObj getShardAndCollectionVersion(OperationContext* opCtx,
     ChunkVersion shardVersion;
 
     if (!swDonorShardVersion.isOK()) {
-        // The query to find 'nss' chunks belonging to the donor shard didn't return any, meaning
-        // the last chunk was donated
-        uassert(505770,
-                str::stream() << "Couldn't retrieve donor chunks from config server",
-                swDonorShardVersion.getStatus().code() == 50577);
-        shardVersion = ChunkVersion(0, 0, collectionVersion.epoch());
+        if (swDonorShardVersion.getStatus().code() == 50577) {
+            // The query to find 'nss' chunks belonging to the donor shard didn't return any chunks,
+            // meaning the last chunk for fromShard was donated. Gracefully handle the error.
+            shardVersion = ChunkVersion(0, 0, collectionVersion.epoch());
+        } else {
+            // Bubble up any other error
+            uassertStatusOK(swDonorShardVersion);
+        }
     } else {
         shardVersion = swDonorShardVersion.getValue();
     }