Update upstream source from tag 'upstream/6.0.0'master

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

1 files changed, 0 insertions, 11 deletions

diff --git a/src/mongo/db/s/sharding_server_status.cpp b/src/mongo/db/s/sharding_server_status.cpp
index bf292614506..5a331364032 100644
--- a/src/mongo/db/s/sharding_server_status.cpp
+++ b/src/mongo/db/s/sharding_server_status.cpp
@@ -31,7 +31,6 @@
 
 #include "mongo/bson/bsonobjbuilder.h"
 #include "mongo/db/commands/server_status.h"
-#include "mongo/db/db_raii.h"
 #include "mongo/db/s/active_migrations_registry.h"
 #include "mongo/db/s/collection_sharding_state.h"
 #include "mongo/db/s/resharding/resharding_metrics.h"
@@ -124,16 +123,6 @@ public:
             CollectionShardingState::appendInfoForServerStatus(opCtx, &result);
         }
 
-        // To calculate the number of sharded collection we simply get the number of records from
-        // `config.collections` collection. This count must only be appended when serverStatus is
-        // invoked on the config server.
-        if (serverGlobalParams.clusterRole == ClusterRole::ConfigServer) {
-            AutoGetCollectionForReadLockFree autoColl(opCtx, CollectionType::ConfigNS);
-            const auto& collection = autoColl.getCollection();
-            const auto numShardedCollections = collection ? collection->numRecords(opCtx) : 0;
-            result.append("numShardedCollections", numShardedCollections);
-        }
-
         // The serverStatus command is run before the FCV is initialized so we ignore it when
         // checking whether the resharding feature is enabled here.
         if (resharding::gFeatureFlagResharding.isEnabledAndIgnoreFCV()) {