SERVER-19543 Thread OperationContext through to everywhere that accesses the CatalogManager

1 files changed, 5 insertions, 5 deletions

diff --git a/src/mongo/db/s/sharding_state.cpp b/src/mongo/db/s/sharding_state.cpp
index cab256a66f6..4aee88c7307 100644
--- a/src/mongo/db/s/sharding_state.cpp
+++ b/src/mongo/db/s/sharding_state.cpp
@@ -84,11 +84,11 @@ bool ShardingState::enabled() {
     return _enabled;
 }
 
-string ShardingState::getConfigServer() {
+string ShardingState::getConfigServer(OperationContext* txn) {
     stdx::lock_guard<stdx::mutex> lk(_mutex);
     invariant(_enabled);
 
-    return grid.catalogManager()->connectionString().toString();
+    return grid.catalogManager(txn)->connectionString().toString();
 }
 
 string ShardingState::getShardName() {
@@ -545,7 +545,7 @@ Status ShardingState::doRefreshMetadata(OperationContext* txn,
     shared_ptr<CollectionMetadata> remoteMetadata(remoteMetadataRaw);
 
     Timer refreshTimer;
-    Status status = mdLoader.makeCollectionMetadata(grid.catalogManager(),
+    Status status = mdLoader.makeCollectionMetadata(grid.catalogManager(txn),
                                                     ns,
                                                     getShardName(),
                                                     fullReload ? NULL : beforeMetadata.get(),
@@ -738,7 +738,7 @@ Status ShardingState::doRefreshMetadata(OperationContext* txn,
     return Status::OK();
 }
 
-void ShardingState::appendInfo(BSONObjBuilder& builder) {
+void ShardingState::appendInfo(OperationContext* txn, BSONObjBuilder& builder) {
     stdx::lock_guard<stdx::mutex> lk(_mutex);
 
     builder.appendBool("enabled", _enabled);
@@ -746,7 +746,7 @@ void ShardingState::appendInfo(BSONObjBuilder& builder) {
         return;
     }
 
-    builder.append("configServer", grid.catalogManager()->connectionString().toString());
+    builder.append("configServer", grid.catalogManager(txn)->connectionString().toString());
     builder.append("shardName", _shardName);
 
     BSONObjBuilder versionB(builder.subobjStart("versions"));