SERVER-6793 - parallel writer batch lock needs to be involved in yield/tempRelease

1 files changed, 11 insertions, 1 deletions

diff --git a/src/mongo/db/lockstate.cpp b/src/mongo/db/lockstate.cpp
index b0ef1f74289..291fbd44d5a 100755
--- a/src/mongo/db/lockstate.cpp
+++ b/src/mongo/db/lockstate.cpp
@@ -35,7 +35,8 @@ namespace mongo {
           _otherCount(0), 
           _otherLock(NULL),
           _scopedLk(NULL),
-          _lockPending(false)
+          _lockPending(false),
+          _lockPendingParallelWriter(false)
     {
     }
 
@@ -241,4 +242,13 @@ namespace mongo {
             stat->recordAcquireTimeMicros( _ls.threadState(), _lock->acquireFinished( stat ) );
     }
     
+    AcquiringParallelWriter::AcquiringParallelWriter( LockState& ls )
+        : _ls( ls ) {
+        _ls._lockPendingParallelWriter = true;
+    }
+    
+    AcquiringParallelWriter::~AcquiringParallelWriter() {
+        _ls._lockPendingParallelWriter = false;
+    }
+
 }