SERVER-16834 bgsync::shutdown() now unblocks threads waiting in BlockingQueue::push()

2 files changed, 4 insertions, 0 deletions

diff --git a/src/mongo/db/repl/bgsync.cpp b/src/mongo/db/repl/bgsync.cpp
index f9868c17ded..8b4166a7476 100644
--- a/src/mongo/db/repl/bgsync.cpp
+++ b/src/mongo/db/repl/bgsync.cpp
@@ -122,6 +122,9 @@ namespace {
     void BackgroundSync::shutdown() {
         boost::lock_guard<boost::mutex> lock(_mutex);
 
+        // Clear the buffer in case the producerThread is waiting in push() due to a full queue.
+        _buffer.clear();
+
         // Wake up producerThread so it notices that we're in shutdown
         _condvar.notify_all();
     }
diff --git a/src/mongo/util/queue.h b/src/mongo/util/queue.h
index 5f87256657f..d6faaccddcc 100644
--- a/src/mongo/util/queue.h
+++ b/src/mongo/util/queue.h
@@ -112,6 +112,7 @@ namespace mongo {
             scoped_lock l(_lock);
             _queue = std::queue<T>();
             _currentSize = 0;
+            _cvNoLongerFull.notify_one();
         }
 
         bool tryPop( T & t ) {