summaryrefslogtreecommitdiff
path: root/src/mongo/db/range_deleter.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mongo/db/range_deleter.cpp')
-rw-r--r--src/mongo/db/range_deleter.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/mongo/db/range_deleter.cpp b/src/mongo/db/range_deleter.cpp
index b97d9fae216..e0d1d5c5aa0 100644
--- a/src/mongo/db/range_deleter.cpp
+++ b/src/mongo/db/range_deleter.cpp
@@ -354,16 +354,13 @@ bool RangeDeleter::deleteNow(OperationContext* txn,
taskDetails.stats.queueEndTS = jsTime();
taskDetails.stats.deleteStartTS = jsTime();
- bool result = _env->deleteRange(txn, taskDetails, &taskDetails.stats.deletedDocCount, errMsg);
-
+ bool result = _env->deleteRange(txn,
+ taskDetails,
+ &taskDetails.stats.deletedDocCount,
+ taskDetails.stats.waitForReplDurationMs,
+ errMsg);
taskDetails.stats.deleteEndTS = jsTime();
- if (result) {
- taskDetails.stats.waitForReplStartTS = jsTime();
- result = _waitForMajority(txn, errMsg);
- taskDetails.stats.waitForReplEndTS = jsTime();
- }
-
{
stdx::lock_guard<stdx::mutex> sl(_queueMutex);
_deleteSet.erase(&deleteRange);
@@ -485,8 +482,11 @@ void RangeDeleter::doWork() {
{
auto txn = client->makeOperationContext();
nextTask->stats.deleteStartTS = jsTime();
- bool delResult =
- _env->deleteRange(txn.get(), *nextTask, &nextTask->stats.deletedDocCount, &errMsg);
+ bool delResult = _env->deleteRange(txn.get(),
+ *nextTask,
+ &nextTask->stats.deletedDocCount,
+ nextTask->stats.waitForReplDurationMs,
+ &errMsg);
nextTask->stats.deleteEndTS = jsTime();
if (delResult) {