diff options
| author | Alex Taskov <alex.taskov@mongodb.com> | 2020-01-14 21:55:45 +0000 |
|---|---|---|
| committer | evergreen <evergreen@mongodb.com> | 2020-01-14 21:55:45 +0000 |
| commit | 169f13aff2b62483e9678409759528a2f9db58e7 (patch) | |
| tree | 7c16a1d73667ff1f757c27c1e34bdd5e91a1832d /src/mongo/db/s/move_chunk_command.cpp | |
| parent | 846c7aa84ac08dbccc7d727e9068406b7b2de033 (diff) | |
| download | mongo-169f13aff2b62483e9678409759528a2f9db58e7.tar.gz | |
SERVER-45179 Add the FCV 4.4 behavior to the MigrationDestinationManager
Diffstat (limited to 'src/mongo/db/s/move_chunk_command.cpp')
| -rw-r--r-- | src/mongo/db/s/move_chunk_command.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mongo/db/s/move_chunk_command.cpp b/src/mongo/db/s/move_chunk_command.cpp index 1fa019e7ebd..68abc0bbb00 100644 --- a/src/mongo/db/s/move_chunk_command.cpp +++ b/src/mongo/db/s/move_chunk_command.cpp @@ -72,7 +72,7 @@ const WriteConcernOptions kMajorityWriteConcern(WriteConcernOptions::kMajority, // writeConcernMajorityJournalDefault is set to true // in the ReplSetConfig. WriteConcernOptions::SyncMode::UNSET, - -1); + WriteConcernOptions::kWriteConcernTimeoutSharding); // Tests can pause and resume moveChunk's progress at each step by enabling/disabling each failpoint MONGO_FAIL_POINT_DEFINE(moveChunkHangAtStep1); @@ -174,6 +174,7 @@ public: writeConcernResult.wTimedOut = false; Status majorityStatus = waitForWriteConcern( opCtx, replClient.getLastOp(), kMajorityWriteConcern, &writeConcernResult); + if (!majorityStatus.isOK()) { if (!writeConcernResult.wTimedOut) { uassertStatusOK(majorityStatus); |