SERVER-19903 Dist lock pinger not running for config RS

4 files changed, 5 insertions, 5 deletions

diff --git a/src/mongo/db/s/merge_chunks_command.cpp b/src/mongo/db/s/merge_chunks_command.cpp
index 58fc9c71ac3..813be2a8aa7 100644
--- a/src/mongo/db/s/merge_chunks_command.cpp
+++ b/src/mongo/db/s/merge_chunks_command.cpp
@@ -152,7 +152,7 @@ public:
                 return false;
             }
 
-            shardingState->initialize(config);
+            shardingState->initialize(txn, config);
         }
 
         // ShardName is optional, but might not be set yet
diff --git a/src/mongo/db/s/set_shard_version_command.cpp b/src/mongo/db/s/set_shard_version_command.cpp
index 03b96373844..6febcbaffa2 100644
--- a/src/mongo/db/s/set_shard_version_command.cpp
+++ b/src/mongo/db/s/set_shard_version_command.cpp
@@ -328,7 +328,7 @@ private:
         }
 
         if (locked) {
-            ShardingState::get(txn)->initialize(configdb);
+            ShardingState::get(txn)->initialize(txn, configdb);
             return true;
         }
 
diff --git a/src/mongo/db/s/sharding_state.cpp b/src/mongo/db/s/sharding_state.cpp
index 90b1a83af2a..1013fddd32e 100644
--- a/src/mongo/db/s/sharding_state.cpp
+++ b/src/mongo/db/s/sharding_state.cpp
@@ -140,7 +140,7 @@ string ShardingState::getShardName() {
     return _shardName;
 }
 
-void ShardingState::initialize(const string& server) {
+void ShardingState::initialize(OperationContext* txn, const string& server) {
     uassert(18509,
             "Unable to obtain host name during sharding initialization.",
             !getHostName().empty());
@@ -156,7 +156,7 @@ void ShardingState::initialize(const string& server) {
     ShardedConnectionInfo::addHook();
 
     ConnectionString configServerCS = uassertStatusOK(ConnectionString::parse(server));
-    uassertStatusOK(initializeGlobalShardingState(configServerCS));
+    uassertStatusOK(initializeGlobalShardingState(txn, configServerCS, false));
 
     _enabled = true;
 }
diff --git a/src/mongo/db/s/sharding_state.h b/src/mongo/db/s/sharding_state.h
index 0f7168355d8..b794a31df5d 100644
--- a/src/mongo/db/s/sharding_state.h
+++ b/src/mongo/db/s/sharding_state.h
@@ -88,7 +88,7 @@ public:
     // Initialize sharding state and begin authenticating outgoing connections and handling
     // shard versions.  If this is not run before sharded operations occur auth will not work
     // and versions will not be tracked.
-    void initialize(const std::string& server);
+    void initialize(OperationContext* txn, const std::string& server);
 
     // TODO: The only reason we need this method and cannot merge it together with the initialize
     // call is the setShardVersion request being sent by the config coordinator to the config server