the journaling thread upgrades its qlock from R to W when it needs to…

… REMAPPRIVATEVIEW. this upgrade was not greedy and that was probably a bug. fixed.
davidsackett · Apr 25, 2012 · 50a2d2c · 50a2d2c
1 parent 007d202
commit 50a2d2c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/mongo/db/d_concurrency.cpp b/src/mongo/db/d_concurrency.cpp
@@ -666,6 +666,11 @@ namespace mongo {
     bool Lock::GlobalWrite::upgrade() { 
         verify( !noop );
         verify( threadState() == 'R' );
+        if( stoppedGreed ) { 
+            // we undo stopgreed here if it were set earlier, as we now want a W lock
+            stoppedGreed = false;
+            q.start_greed();
+        }
         if( q.R_to_W() ) {
             lockState().changeLockState( 'W' );
             return true;

diff --git a/src/mongo/db/d_concurrency.h b/src/mongo/db/d_concurrency.h
@@ -56,7 +56,7 @@ namespace mongo {
         // i.e. you could grab globalread after globalwrite.
 
         class GlobalWrite : public ScopedLock {
-            const bool stoppedGreed;
+            bool stoppedGreed;
             bool noop;
         protected:
             void tempRelease();