SERVER-52872 Remove StatusWith methods from ShardingCatalogClient

As a side-effect also removes some of the legacy "fromBSON" parsing from
CollectionType in an effort to make it behave more IDL-like.

1 files changed, 6 insertions, 12 deletions

diff --git a/src/mongo/s/sharding_initialization.cpp b/src/mongo/s/sharding_initialization.cpp
index af0cb15f5ea..a721115577d 100644
--- a/src/mongo/s/sharding_initialization.cpp
+++ b/src/mongo/s/sharding_initialization.cpp
@@ -279,20 +279,14 @@ Status preCacheMongosRoutingInfo(OperationContext* opCtx) {
     }
 
     auto grid = Grid::get(opCtx);
+    auto catalogClient = grid->catalogClient();
+    auto catalogCache = grid->catalogCache();
+    auto allDbs = catalogClient->getAllDBs(opCtx, repl::ReadConcernLevel::kMajorityReadConcern);
 
-    auto shardingCatalogClient = grid->catalogClient();
-    auto result =
-        shardingCatalogClient->getAllDBs(opCtx, repl::ReadConcernLevel::kMajorityReadConcern);
-
-    if (!result.isOK()) {
-        return result.getStatus();
-    }
-
-    auto cache = grid->catalogCache();
-    for (auto& db : result.getValue().value) {
-        for (auto& coll : shardingCatalogClient->getAllShardedCollectionsForDb(
+    for (auto& db : allDbs) {
+        for (auto& coll : catalogClient->getAllShardedCollectionsForDb(
                  opCtx, db.getName(), repl::ReadConcernLevel::kMajorityReadConcern)) {
-            auto resp = cache->getShardedCollectionRoutingInfoWithRefresh(opCtx, coll);
+            auto resp = catalogCache->getShardedCollectionRoutingInfoWithRefresh(opCtx, coll);
             if (!resp.isOK()) {
                 return resp.getStatus();
             }