SERVER-39934 Fix locking for slow ops storage stats

SERVER-39654 Make slow ops storage stats work with transactions

2 files changed, 9 insertions, 0 deletions

diff --git a/src/mongo/db/concurrency/global_lock_acquisition_tracker.cpp b/src/mongo/db/concurrency/global_lock_acquisition_tracker.cpp
index c28bfb643aa..eeec12f3c1a 100644
--- a/src/mongo/db/concurrency/global_lock_acquisition_tracker.cpp
+++ b/src/mongo/db/concurrency/global_lock_acquisition_tracker.cpp
@@ -44,6 +44,10 @@ bool GlobalLockAcquisitionTracker::getGlobalSharedLockTaken() const {
     return _globalLockMode & (1 << MODE_S);
 }
 
+bool GlobalLockAcquisitionTracker::getGlobalLockTaken() const {
+    return _globalLockMode & ((1 << MODE_IX) | (1 << MODE_X) | (1 << MODE_IS) | (1 << MODE_S));
+}
+
 void GlobalLockAcquisitionTracker::setGlobalLockModeBit(LockMode mode) {
     _globalLockMode |= (1 << mode);
 }
diff --git a/src/mongo/db/concurrency/global_lock_acquisition_tracker.h b/src/mongo/db/concurrency/global_lock_acquisition_tracker.h
index 4e3e5f8bcc5..dae19eb537f 100644
--- a/src/mongo/db/concurrency/global_lock_acquisition_tracker.h
+++ b/src/mongo/db/concurrency/global_lock_acquisition_tracker.h
@@ -58,6 +58,11 @@ public:
     bool getGlobalSharedLockTaken() const;
 
     /**
+     * Returns whether we have ever taken a global lock in this operation.
+     */
+    bool getGlobalLockTaken() const;
+
+    /**
      * Sets the mode bit in _globalLockMode. Once a mode bit is set, we won't clear it.
      */
     void setGlobalLockModeBit(LockMode mode);