SERVER-23550 Cleanup balancer methods to use StatusWith

1 files changed, 7 insertions, 5 deletions

diff --git a/src/mongo/s/balancer_policy.cpp b/src/mongo/s/balancer_policy.cpp
index f8ff4c49f65..e4ac76a0db9 100644
--- a/src/mongo/s/balancer_policy.cpp
+++ b/src/mongo/s/balancer_policy.cpp
@@ -271,13 +271,15 @@ void DistributionStatus::dump() const {
     }
 }
 
-Status DistributionStatus::populateShardInfoMap(OperationContext* txn, ShardInfoMap* shardInfo) {
+StatusWith<ShardInfoMap> DistributionStatus::populateShardInfoMap(OperationContext* txn) {
     try {
         auto shardsStatus = grid.catalogManager(txn)->getAllShards(txn);
         if (!shardsStatus.isOK()) {
             return shardsStatus.getStatus();
         }
-        vector<ShardType> shards = std::move(shardsStatus.getValue().value);
+        const vector<ShardType> shards(std::move(shardsStatus.getValue().value));
+
+        ShardInfoMap shardInfo;
 
         for (const ShardType& shardData : shards) {
             std::set<std::string> dummy;
@@ -298,13 +300,13 @@ Status DistributionStatus::populateShardInfoMap(OperationContext* txn, ShardInfo
                 newShardEntry.addTag(shardTag);
             }
 
-            shardInfo->insert(make_pair(shardData.getName(), newShardEntry));
+            shardInfo.insert(make_pair(shardData.getName(), newShardEntry));
         }
+
+        return std::move(shardInfo);
     } catch (const DBException& ex) {
         return ex.toStatus();
     }
-
-    return Status::OK();
 }
 
 void DistributionStatus::populateShardToChunksMap(const ShardInfoMap& allShards,