summaryrefslogtreecommitdiff
path: root/src/mongo/db/concurrency
diff options
context:
space:
mode:
authorHaley Connelly <haley.connelly@mongodb.com>2022-10-31 10:30:41 +0000
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2022-10-31 11:04:27 +0000
commit23c0f6ebdab069e2fa97e42194bdbade77a62810 (patch)
treed4d12e46be38a57b34f4051c44beb42bcbbfd2d1 /src/mongo/db/concurrency
parentc44135cca044b087f529a3024bea8e2c2f1866f4 (diff)
downloadmongo-23c0f6ebdab069e2fa97e42194bdbade77a62810.tar.gz
SERVER-70721 Rename SetTicketAquisitionPriorityForLock to SetAdmissionPriorityForLock
Diffstat (limited to 'src/mongo/db/concurrency')
-rw-r--r--src/mongo/db/concurrency/lock_state.h15
-rw-r--r--src/mongo/db/concurrency/lock_state_test.cpp9
2 files changed, 11 insertions, 13 deletions
diff --git a/src/mongo/db/concurrency/lock_state.h b/src/mongo/db/concurrency/lock_state.h
index 9d37c7e0c50..9dd80b25110 100644
--- a/src/mongo/db/concurrency/lock_state.h
+++ b/src/mongo/db/concurrency/lock_state.h
@@ -421,16 +421,15 @@ public:
};
/**
- * RAII-style class to set the priority for the ticket acquisition mechanism when acquiring a global
+ * RAII-style class to set the priority for the ticket admission mechanism when acquiring a global
* lock.
*/
-class SetTicketAquisitionPriorityForLock {
+class SetAdmissionPriorityForLock {
public:
- SetTicketAquisitionPriorityForLock(const SetTicketAquisitionPriorityForLock&) = delete;
- SetTicketAquisitionPriorityForLock& operator=(const SetTicketAquisitionPriorityForLock&) =
- delete;
- explicit SetTicketAquisitionPriorityForLock(OperationContext* opCtx,
- AdmissionContext::Priority priority)
+ SetAdmissionPriorityForLock(const SetAdmissionPriorityForLock&) = delete;
+ SetAdmissionPriorityForLock& operator=(const SetAdmissionPriorityForLock&) = delete;
+ explicit SetAdmissionPriorityForLock(OperationContext* opCtx,
+ AdmissionContext::Priority priority)
: _opCtx(opCtx), _originalPriority(opCtx->lockState()->getAdmissionPriority()) {
uassert(ErrorCodes::IllegalOperation,
"It is illegal for an operation to demote a high priority to a lower priority "
@@ -440,7 +439,7 @@ public:
_opCtx->lockState()->setAdmissionPriority(priority);
}
- ~SetTicketAquisitionPriorityForLock() {
+ ~SetAdmissionPriorityForLock() {
_opCtx->lockState()->setAdmissionPriority(_originalPriority);
}
diff --git a/src/mongo/db/concurrency/lock_state_test.cpp b/src/mongo/db/concurrency/lock_state_test.cpp
index 607c2c076f7..0062fe990ae 100644
--- a/src/mongo/db/concurrency/lock_state_test.cpp
+++ b/src/mongo/db/concurrency/lock_state_test.cpp
@@ -1244,20 +1244,19 @@ TEST_F(LockerImplTest, SetTicketAcquisitionForLockRAIIType) {
ASSERT_TRUE(opCtx->lockState()->shouldWaitForTicket());
{
- SetTicketAquisitionPriorityForLock setTicketAquisition(
- opCtx.get(), AdmissionContext::Priority::kImmediate);
+ SetAdmissionPriorityForLock setTicketAquisition(opCtx.get(),
+ AdmissionContext::Priority::kImmediate);
ASSERT_FALSE(opCtx->lockState()->shouldWaitForTicket());
}
ASSERT_TRUE(opCtx->lockState()->shouldWaitForTicket());
- // If ticket acquisitions are disabled on the lock state, the RAII type has no effect.
opCtx->lockState()->setAdmissionPriority(AdmissionContext::Priority::kImmediate);
ASSERT_FALSE(opCtx->lockState()->shouldWaitForTicket());
{
- SetTicketAquisitionPriorityForLock setTicketAquisition(
- opCtx.get(), AdmissionContext::Priority::kImmediate);
+ SetAdmissionPriorityForLock setTicketAquisition(opCtx.get(),
+ AdmissionContext::Priority::kImmediate);
ASSERT_FALSE(opCtx->lockState()->shouldWaitForTicket());
}