diff options
author | Kaloian Manassiev <kaloian.manassiev@mongodb.com> | 2016-06-30 14:32:22 -0400 |
---|---|---|
committer | Kaloian Manassiev <kaloian.manassiev@mongodb.com> | 2016-07-28 09:27:29 -0400 |
commit | 53f346b85633e206f00b3c5cdd702a7ef3e90095 (patch) | |
tree | 147b8a81be06734ee239ef2a9526e089887a3c33 | |
parent | 2b0c3985427d5795dd685b222930c07c1961b4e2 (diff) | |
download | mongo-53f346b85633e206f00b3c5cdd702a7ef3e90095.tar.gz |
SERVER-24842 ShardingStateRecovery::recover cleanup should not wait for replication
-rw-r--r-- | src/mongo/db/s/sharding_state_recovery.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/mongo/db/s/sharding_state_recovery.cpp b/src/mongo/db/s/sharding_state_recovery.cpp index 804f4b21ca2..2863d044c2f 100644 --- a/src/mongo/db/s/sharding_state_recovery.cpp +++ b/src/mongo/db/s/sharding_state_recovery.cpp @@ -62,10 +62,13 @@ const char kShardName[] = "shardName"; const char kMinOpTime[] = "minOpTime"; const char kMinOpTimeUpdaters[] = "minOpTimeUpdaters"; -const Seconds kWriteTimeout(15); const WriteConcernOptions kMajorityWriteConcern(WriteConcernOptions::kMajority, WriteConcernOptions::SyncMode::UNSET, - kWriteTimeout); + Seconds(15)); + +const WriteConcernOptions kLocalWriteConcern(1, + WriteConcernOptions::SyncMode::UNSET, + Milliseconds(0)); MONGO_EXPORT_STARTUP_SERVER_PARAMETER(recoverShardingState, bool, true); @@ -305,7 +308,7 @@ Status ShardingStateRecovery::recover(OperationContext* txn) { << grid.shardRegistry()->getConfigOpTime(); // Finally, clear the recovery document so next time we don't need to recover - status = modifyRecoveryDocument(txn, RecoveryDocument::Clear, kMajorityWriteConcern); + status = modifyRecoveryDocument(txn, RecoveryDocument::Clear, kLocalWriteConcern); if (!status.isOK()) { warning() << "Failed to reset sharding state recovery document due to " << status; } |