diff options
| author | Michael Cahill <michael.cahill@mongodb.com> | 2016-02-02 14:29:35 +1100 |
|---|---|---|
| committer | Michael Cahill <michael.cahill@mongodb.com> | 2016-02-02 14:43:09 +1100 |
| commit | b7bb72efb1e3f96398f1a416de7a102f4eb17f82 (patch) | |
| tree | 1c5a176567320fe59e510574b9a28b28cc797552 | |
| parent | ce2fa6d5224ccda6d3ba4dc48456db6caeaeded6 (diff) | |
| download | mongo-b7bb72efb1e3f96398f1a416de7a102f4eb17f82.tar.gz | |
SERVER-22199 Don't wait for WT locks during drop.
(cherry picked from commit aa98ee551e0fcface0a1c9d63001c269c068d9ac)
| -rw-r--r-- | src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp b/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp index 22ae293a595..5a9ab07b36a 100644 --- a/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp +++ b/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp @@ -456,7 +456,8 @@ bool WiredTigerKVEngine::_drop(StringData ident) { WiredTigerSession session(_conn); - int ret = session.getSession()->drop(session.getSession(), uri.c_str(), "force"); + int ret = + session.getSession()->drop(session.getSession(), uri.c_str(), "force,lock_wait=false"); LOG(1) << "WT drop of " << uri << " res " << ret; if (ret == 0) { @@ -510,7 +511,8 @@ void WiredTigerKVEngine::dropAllQueued() { WiredTigerSession session(_conn); for (set<string>::const_iterator it = mine.begin(); it != mine.end(); ++it) { string uri = *it; - int ret = session.getSession()->drop(session.getSession(), uri.c_str(), "force"); + int ret = session.getSession()->drop( + session.getSession(), uri.c_str(), "force,lock_wait=false"); LOG(1) << "WT queued drop of " << uri << " res " << ret; if (ret == 0) { |