SERVER-36071 Check status of shardsvrShardCollection

(cherry picked from commit a291ec89affd9e849ac62ad55a736bfb940a0bb6)

1 files changed, 9 insertions, 1 deletions

diff --git a/src/mongo/db/s/config/configsvr_shard_collection_command.cpp b/src/mongo/db/s/config/configsvr_shard_collection_command.cpp
index d16a4d23b8a..03d62642551 100644
--- a/src/mongo/db/s/config/configsvr_shard_collection_command.cpp
+++ b/src/mongo/db/s/config/configsvr_shard_collection_command.cpp
@@ -780,10 +780,18 @@ public:
                     cmdObj, shardsvrShardCollectionRequest.toBSON())),
                 Shard::RetryPolicy::kIdempotent));
 
-            CommandHelpers::filterCommandReplyForPassthrough(cmdResponse.response, &result);
+            // SERVER-14394 Remove status check below and replace with
+            // filterCommandReplyForPassthrough
+            uassertStatusOK(cmdResponse.commandStatus);
 
             auto shardCollResponse = ShardsvrShardCollectionResponse::parse(
                 IDLParserErrorContext("ShardsvrShardCollectionResponse"), cmdResponse.response);
+            auto uuid = std::move(shardCollResponse.getCollectionUUID());
+
+            result << "collectionsharded" << nss.ns();
+            if (uuid) {
+                result << "collectionUUID" << *uuid;
+            }
 
             // Make sure the cached metadata for the collection knows that we are now sharded
             catalogCache->invalidateShardedCollection(nss);