diff options
| author | George Wangensteen <george.wangensteen@mongodb.com> | 2021-02-04 16:23:05 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-02-04 17:45:23 +0000 |
| commit | 3b4c40b136da419512bf6501655473db552efb11 (patch) | |
| tree | afa116d98dd44521a2983b97e0f91dcafa859ab5 /src/mongo/db/s/range_deletion_util.cpp | |
| parent | f6119db22f13329a15be3771f732088a06130922 (diff) | |
| download | mongo-3b4c40b136da419512bf6501655473db552efb11.tar.gz | |
Revert "SERVER-50656 Add cancellation support to WaitForMajorityService"
This reverts commit da77452821c355346d873a6b31160c101adc60de.
Diffstat (limited to 'src/mongo/db/s/range_deletion_util.cpp')
| -rw-r--r-- | src/mongo/db/s/range_deletion_util.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mongo/db/s/range_deletion_util.cpp b/src/mongo/db/s/range_deletion_util.cpp index 1468b2a74c9..1c2189e7177 100644 --- a/src/mongo/db/s/range_deletion_util.cpp +++ b/src/mongo/db/s/range_deletion_util.cpp @@ -407,7 +407,7 @@ ExecutorFuture<void> waitForDeletionsToMajorityReplicate( // Asynchronously wait for majority write concern. return WaitForMajorityService::get(opCtx->getServiceContext()) - .waitUntilMajority(clientOpTime, CancelationToken::uncancelable()) + .waitUntilMajority(clientOpTime) .thenRunOn(executor); }); } |