SERVER-17254: Throttle retry of failed drop attempts

2 files changed, 15 insertions, 0 deletions

diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp b/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp
index 1dcedb91167..2d6f22789ab 100644
--- a/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp
+++ b/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp
@@ -48,6 +48,7 @@
 #include "mongo/util/log.h"
 #include "mongo/util/processinfo.h"
 #include "mongo/util/scopeguard.h"
+#include "mongo/util/time_support.h"
 
 #if !defined(__has_feature)
 #define __has_feature(x) 0
@@ -95,6 +96,8 @@ namespace mongo {
             }
         }
 
+        _previousCheckedDropsQueued = curTimeMillis64();
+
         std::stringstream ss;
         ss << "create,";
         ss << "cache_size=" << cacheSizeGB << "G,";
@@ -350,10 +353,20 @@ namespace mongo {
     }
 
     bool WiredTigerKVEngine::haveDropsQueued() const {
+        int64_t now = curTimeMillis64();
+        int64_t delta = now - _previousCheckedDropsQueued;
+
         if ( _sizeStorerSyncTracker.intervalHasElapsed() ) {
             _sizeStorerSyncTracker.resetLastTime();
             syncSizeInfo(false);
         }
+
+        // We only want to check the queue max once per second or we'll thrash
+        // This is done in haveDropsQueued, not dropAllQueued so we skip the mutex
+        if (delta < 1000)
+            return false;
+
+        _previousCheckedDropsQueued = now;
         boost::mutex::scoped_lock lk( _identToDropMutex );
         return !_identToDrop.empty();
     }
diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.h b/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.h
index 9e418dd64a5..cba8f284c85 100644
--- a/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.h
+++ b/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.h
@@ -153,6 +153,8 @@ namespace mongo {
         boost::scoped_ptr<WiredTigerSizeStorer> _sizeStorer;
         std::string _sizeStorerUri;
         mutable ElapsedTracker _sizeStorerSyncTracker;
+
+        mutable int64_t _previousCheckedDropsQueued;
     };
 
 }