diff options
| author | Kaloian Manassiev <kaloian.manassiev@mongodb.com> | 2018-07-29 22:57:56 -0400 |
|---|---|---|
| committer | Kaloian Manassiev <kaloian.manassiev@mongodb.com> | 2018-08-01 12:00:24 -0400 |
| commit | 24e411d5cd7f64c5b4da25a351529cd1873284b8 (patch) | |
| tree | 060674e8824d23401972831e1d13e5d909ca9f30 /src/mongo/db/s/shard_server_catalog_cache_loader.cpp | |
| parent | ce94b03f8c141dc0a34ff8682866795458684e45 (diff) | |
| download | mongo-24e411d5cd7f64c5b4da25a351529cd1873284b8.tar.gz | |
SERVER-29908 Remove ShardingState::appendInfo
Expose the ShardingState properties and move the appendInfo logic to be
entirely inside the 'getShardingState' function, which is its only
consumer.
Diffstat (limited to 'src/mongo/db/s/shard_server_catalog_cache_loader.cpp')
| -rw-r--r-- | src/mongo/db/s/shard_server_catalog_cache_loader.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mongo/db/s/shard_server_catalog_cache_loader.cpp b/src/mongo/db/s/shard_server_catalog_cache_loader.cpp index 2db03cec50a..bffca0350bd 100644 --- a/src/mongo/db/s/shard_server_catalog_cache_loader.cpp +++ b/src/mongo/db/s/shard_server_catalog_cache_loader.cpp @@ -277,7 +277,7 @@ void forcePrimaryCollectionRefreshAndWaitForReplication(OperationContext* opCtx, invariant(shardingState->enabled()); auto selfShard = uassertStatusOK( - Grid::get(opCtx)->shardRegistry()->getShard(opCtx, shardingState->getShardName())); + Grid::get(opCtx)->shardRegistry()->getShard(opCtx, shardingState->shardId())); auto cmdResponse = uassertStatusOK(selfShard->runCommandWithFixedRetryAttempts( opCtx, @@ -302,7 +302,7 @@ void forcePrimaryDatabaseRefreshAndWaitForReplication(OperationContext* opCtx, S invariant(shardingState->enabled()); auto selfShard = uassertStatusOK( - Grid::get(opCtx)->shardRegistry()->getShard(opCtx, shardingState->getShardName())); + Grid::get(opCtx)->shardRegistry()->getShard(opCtx, shardingState->shardId())); auto cmdResponse = uassertStatusOK(selfShard->runCommandWithFixedRetryAttempts( opCtx, |