diff options
author | Benety Goh <benety@mongodb.com> | 2018-01-24 10:50:00 -0500 |
---|---|---|
committer | Benety Goh <benety@mongodb.com> | 2018-02-10 10:10:51 -0500 |
commit | a854e4a768da44f820f13742caba92486dc5e58d (patch) | |
tree | e551d4d6494e4ffd59ef1a0ce9ba9bd68c580719 | |
parent | e0c0a12a2894a7bf26a111515e9f5a2e725699dd (diff) | |
download | mongo-a854e4a768da44f820f13742caba92486dc5e58d.tar.gz |
SERVER-32783 remove unnecessary scheduleWork call from CollectionCloner::_verifyCollectionDropped()
(cherry picked from commit 785f56934fcb09f121980ccf6c51d97c3af80fa2)
-rw-r--r-- | src/mongo/db/repl/collection_cloner.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/mongo/db/repl/collection_cloner.cpp b/src/mongo/db/repl/collection_cloner.cpp index a6d9342c464..ffcbf7fafb0 100644 --- a/src/mongo/db/repl/collection_cloner.cpp +++ b/src/mongo/db/repl/collection_cloner.cpp @@ -866,14 +866,7 @@ void CollectionCloner::_verifyCollectionWasDropped( << "' uuid: UUID(\"" << *_options.uuid << "\"), status " << args.response.status; } - // Because setResultAndCancelRemainingWork destroys the RemoteCommandRetryScheduler, it - // must be done outside this callback. - auto result = _executor->scheduleWork([this, finalStatus, onCompletionGuard]( - const executor::TaskExecutor::CallbackArgs& args) { - UniqueLock lk(_mutex); - onCompletionGuard->setResultAndCancelRemainingWork_inlock(lk, finalStatus); - }); - invariant(result.isOK() || result.getStatus().code() == ErrorCodes::ShutdownInProgress); + onCompletionGuard->setResultAndCancelRemainingWork_inlock(lk, finalStatus); }, RemoteCommandRetryScheduler::makeNoRetryPolicy()); |