diff options
| author | Matthew Saltz <matthew.saltz@mongodb.com> | 2018-06-07 14:35:58 -0400 |
|---|---|---|
| committer | Matthew Saltz <matthew.saltz@mongodb.com> | 2018-06-13 17:02:08 -0400 |
| commit | 09919208ae16cd44f3ca3e98220e1cc322419a8a (patch) | |
| tree | e0830b8d56407a2131f0b5e09bf489ea42d848e7 /src/mongo/db/s/sharding_state.cpp | |
| parent | 85477a157ab217912eec55422a9d7b2d0e7b0d47 (diff) | |
| download | mongo-09919208ae16cd44f3ca3e98220e1cc322419a8a.tar.gz | |
SERVER-35486 Create _addShard command on shard to drive shard initialization
Diffstat (limited to 'src/mongo/db/s/sharding_state.cpp')
| -rw-r--r-- | src/mongo/db/s/sharding_state.cpp | 10 |
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 3850454d36f..c45ddb1e71d 100644 --- a/src/mongo/db/s/sharding_state.cpp +++ b/src/mongo/db/s/sharding_state.cpp @@ -190,7 +190,7 @@ Status ShardingState::initializeFromShardIdentity(OperationContext* opCtx, stdx::unique_lock<stdx::mutex> lk(_mutex); - auto configSvrConnStr = shardIdentity.getConfigsvrConnString(); + const auto& configSvrConnStr = shardIdentity.getConfigsvrConnectionString(); if (enabled()) { invariant(!_shardName.empty()); @@ -241,7 +241,7 @@ Status ShardingState::initializeFromShardIdentity(OperationContext* opCtx, _initializationStatus = status; _setInitializationState(InitializationState::kError); } - _shardName = shardIdentity.getShardName(); + _shardName = shardIdentity.getShardName().toString(); _clusterId = shardIdentity.getClusterId(); return status; @@ -275,8 +275,8 @@ StatusWith<bool> ShardingState::initializeShardingAwarenessIfNeeded(OperationCon "If started with --shardsvr in queryableBackupMode, a shardIdentity " "document must be provided through --overrideShardIdentity"}; } - auto swOverrideShardIdentity = - ShardIdentityType::fromBSON(serverGlobalParams.overrideShardIdentity); + auto swOverrideShardIdentity = ShardIdentityType::fromShardIdentityDocument( + serverGlobalParams.overrideShardIdentity); if (!swOverrideShardIdentity.isOK()) { return swOverrideShardIdentity.getStatus(); } @@ -345,7 +345,7 @@ StatusWith<bool> ShardingState::initializeShardingAwarenessIfNeeded(OperationCon invariant(!shardIdentityBSON.isEmpty()); - auto swShardIdentity = ShardIdentityType::fromBSON(shardIdentityBSON); + auto swShardIdentity = ShardIdentityType::fromShardIdentityDocument(shardIdentityBSON); if (!swShardIdentity.isOK()) { return swShardIdentity.getStatus(); } |