SERVER-23996 ShardRegistry::getShard should return a StatusWith<shared_ptr<Shard>>

1 files changed, 4 insertions, 2 deletions

diff --git a/src/mongo/s/client/shard_connection.cpp b/src/mongo/s/client/shard_connection.cpp
index a4faaa34377..7e38ed59b9e 100644
--- a/src/mongo/s/client/shard_connection.cpp
+++ b/src/mongo/s/client/shard_connection.cpp
@@ -281,10 +281,12 @@ public:
         // Now only check top-level shard connections
         for (const ShardId& shardId : all) {
             try {
-                const auto shard = grid.shardRegistry()->getShard(txn, shardId);
-                if (!shard) {
+                auto shardStatus = grid.shardRegistry()->getShard(txn, shardId);
+                if (!shardStatus.isOK()) {
+                    invariant(shardStatus == ErrorCodes::ShardNotFound);
                     continue;
                 }
+                const auto shard = shardStatus.getValue();
 
                 string sconnString = shard->getConnString().toString();
                 Status* s = _getStatus(sconnString);