SERVER-24242 Lock::ParallelBatchWriterMode sets isBatchWriter while in scope

1 files changed, 8 insertions, 1 deletions

diff --git a/src/mongo/db/concurrency/d_concurrency.cpp b/src/mongo/db/concurrency/d_concurrency.cpp
index cf66b2e5620..0879f8bda4f 100644
--- a/src/mongo/db/concurrency/d_concurrency.cpp
+++ b/src/mongo/db/concurrency/d_concurrency.cpp
@@ -185,7 +185,14 @@ void Lock::OplogIntentWriteLock::serializeIfNeeded() {
 }
 
 Lock::ParallelBatchWriterMode::ParallelBatchWriterMode(Locker* lockState)
-    : _pbwm(lockState, resourceIdParallelBatchWriterMode, MODE_X) {}
+    : _pbwm(lockState, resourceIdParallelBatchWriterMode, MODE_X), _lockState(lockState) {
+    invariant(!_lockState->isBatchWriter());  // Otherwise we couldn't clear in destructor.
+    _lockState->setIsBatchWriter(true);
+}
+
+Lock::ParallelBatchWriterMode::~ParallelBatchWriterMode() {
+    _lockState->setIsBatchWriter(false);
+}
 
 void Lock::ResourceLock::lock(LockMode mode) {
     invariant(_result == LOCK_INVALID);