diff options
| author | Dianna Hohensee <dianna.hohensee@10gen.com> | 2019-06-17 10:59:29 -0400 |
|---|---|---|
| committer | Dianna Hohensee <dianna.hohensee@10gen.com> | 2019-06-18 14:29:01 -0400 |
| commit | 8f4b0b3817fbf48cc0025632802aec37d21946da (patch) | |
| tree | 558d5b76843864a1ba66bb3e6b1ff023c9f7f84b /src/mongo/db/concurrency | |
| parent | beaa372035ef597e77db2220bb624028417d9ce5 (diff) | |
| download | mongo-8f4b0b3817fbf48cc0025632802aec37d21946da.tar.gz | |
SERVER-41105 Consistently refer to the PBWM lock in code and text
Diffstat (limited to 'src/mongo/db/concurrency')
| -rw-r--r-- | src/mongo/db/concurrency/lock_manager_defs.h | 4 | ||||
| -rw-r--r-- | src/mongo/db/concurrency/lock_stats_test.cpp | 2 | ||||
| -rw-r--r-- | src/mongo/db/concurrency/locker.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/mongo/db/concurrency/lock_manager_defs.h b/src/mongo/db/concurrency/lock_manager_defs.h index 4d80fab87c5..857599e8cb8 100644 --- a/src/mongo/db/concurrency/lock_manager_defs.h +++ b/src/mongo/db/concurrency/lock_manager_defs.h @@ -155,7 +155,7 @@ enum LockResult { enum ResourceType { RESOURCE_INVALID = 0, - /** Parallel batch writer mutex */ + /** Parallel batch writer mode lock */ RESOURCE_PBWM, /** Replication state transition lock. */ @@ -180,7 +180,7 @@ enum ResourceType { * Maps the resource id to a human-readable string. */ static const char* ResourceTypeNames[] = {"Invalid", - "ParallelBatchWriter", + "ParallelBatchWriterMode", "ReplicationStateTransition", "Global", "Database", diff --git a/src/mongo/db/concurrency/lock_stats_test.cpp b/src/mongo/db/concurrency/lock_stats_test.cpp index f2aa46e3a5c..d791551bbe0 100644 --- a/src/mongo/db/concurrency/lock_stats_test.cpp +++ b/src/mongo/db/concurrency/lock_stats_test.cpp @@ -215,7 +215,7 @@ TEST_F(LockStatsTest, ServerStatus) { ASSERT_EQUALS( 1, lockingStats.getObjectField("Global").getObjectField("acquireCount").getIntField("w")); ASSERT_EQUALS(1, - lockingStats.getObjectField("ParallelBatchWriter") + lockingStats.getObjectField("ParallelBatchWriterMode") .getObjectField("acquireCount") .getIntField("w")); ASSERT_EQUALS(1, diff --git a/src/mongo/db/concurrency/locker.h b/src/mongo/db/concurrency/locker.h index 166bf0d124f..47996f9b62a 100644 --- a/src/mongo/db/concurrency/locker.h +++ b/src/mongo/db/concurrency/locker.h @@ -595,7 +595,7 @@ private: }; /** - * RAII-style class to opt out of replication's use of ParallelBatchWriterMode. + * RAII-style class to opt out of replication's use of the ParallelBatchWriterMode lock. */ class ShouldNotConflictWithSecondaryBatchApplicationBlock { ShouldNotConflictWithSecondaryBatchApplicationBlock( |