Update upstream source from tag 'upstream/6.0.0'master

Update to upstream version '6.0.0'
with Debian dir 5604a80ec1c96ca76f25f40d78e6ef855abec322

1 files changed, 8 insertions, 2 deletions

diff --git a/src/mongo/db/s/balancer/cluster_statistics.cpp b/src/mongo/db/s/balancer/cluster_statistics.cpp
index 73f202cbfbc..b9fffb0af51 100644
--- a/src/mongo/db/s/balancer/cluster_statistics.cpp
+++ b/src/mongo/db/s/balancer/cluster_statistics.cpp
@@ -54,23 +54,27 @@ ClusterStatistics::ShardStatistics::ShardStatistics(ShardId inShardId,
                                                     uint64_t inCurrSizeBytes,
                                                     bool inIsDraining,
                                                     std::set<std::string> inShardTags,
+                                                    std::string inMongoVersion,
                                                     use_bytes_t t)
     : shardId(std::move(inShardId)),
       maxSizeBytes(inMaxSizeBytes),
       currSizeBytes(inCurrSizeBytes),
       isDraining(inIsDraining),
-      shardTags(std::move(inShardTags)) {}
+      shardTags(std::move(inShardTags)),
+      mongoVersion(std::move(inMongoVersion)) {}
 
 ClusterStatistics::ShardStatistics::ShardStatistics(ShardId inShardId,
                                                     uint64_t inMaxSizeMB,
                                                     uint64_t inCurrSizeMB,
                                                     bool inIsDraining,
-                                                    std::set<std::string> inShardTags)
+                                                    std::set<std::string> inShardTags,
+                                                    std::string inMongoVersion)
     : ShardStatistics(inShardId,
                       convertMBToBytes(inMaxSizeMB),
                       convertMBToBytes(inCurrSizeMB),
                       inIsDraining,
                       std::move(inShardTags),
+                      std::move(inMongoVersion),
                       use_bytes_t{}) {}
 
 bool ClusterStatistics::ShardStatistics::isSizeMaxed() const {
@@ -91,6 +95,8 @@ BSONObj ClusterStatistics::ShardStatistics::toBSON() const {
         BSONArrayBuilder arrayBuilder(builder.subarrayStart("tags"));
         arrayBuilder.append(shardTags);
     }
+
+    builder.append("version", mongoVersion);
     return builder.obj();
 }