Revert "SERVER-24126 Add step to _cfgsvrAddShard command where it inserts the shardIdentity document to the new shard"

This reverts commit 1e26998e7fda52c226385fae4069ebbc384c294a.

1 files changed, 1 insertions, 9 deletions

diff --git a/src/mongo/s/client/shard_registry.cpp b/src/mongo/s/client/shard_registry.cpp
index 11f0e7e7c2c..fb9339b660c 100644
--- a/src/mongo/s/client/shard_registry.cpp
+++ b/src/mongo/s/client/shard_registry.cpp
@@ -39,7 +39,6 @@
 #include "mongo/client/connection_string.h"
 #include "mongo/client/replica_set_monitor.h"
 #include "mongo/s/catalog/catalog_manager.h"
-#include "mongo/s/catalog/type_config_version.h"
 #include "mongo/s/catalog/type_shard.h"
 #include "mongo/s/client/shard.h"
 #include "mongo/s/client/shard_connection.h"
@@ -60,12 +59,9 @@ using std::string;
 using std::unique_ptr;
 using std::vector;
 
-// TODO SERVER-23096: Initializing an empty _clusterId is a temporary hack. The _clusterId should
-// be queried from the config servers on sharding initialization and passed to the ShardRegistry
-// constructor.
 ShardRegistry::ShardRegistry(std::unique_ptr<ShardFactory> shardFactory,
                              const ConnectionString& configServerCS)
-    : _shardFactory(std::move(shardFactory)), _clusterId(), _data() {
+    : _shardFactory(std::move(shardFactory)), _data() {
     _initConfigServerCS = configServerCS;
 }
 
@@ -73,10 +69,6 @@ ConnectionString ShardRegistry::getConfigServerConnectionString() const {
     return getConfigShard()->getConnString();
 }
 
-const OID& ShardRegistry::getClusterId() const {
-    return _clusterId;
-}
-
 void ShardRegistry::rebuildConfigShard() {
     _data.rebuildConfigShard(_shardFactory.get());
     invariant(_data.getConfigShard());