From e7a7530bc76d62424afa455dc36495b57b09cd93 Mon Sep 17 00:00:00 2001 From: Lingzhi Deng Date: Sat, 28 Sep 2019 20:50:18 +0000 Subject: SERVER-43330 Remove ReplicationStateTransitionLockGuard move constructor (cherry picked from commit e4139a8394fb7d35503a0b559fc90723f7ab9de7) --- .../db/concurrency/replication_state_transition_lock_guard.cpp | 6 ------ src/mongo/db/concurrency/replication_state_transition_lock_guard.h | 2 +- src/mongo/db/repl/replication_coordinator_impl_test.cpp | 3 ++- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/mongo/db/concurrency/replication_state_transition_lock_guard.cpp b/src/mongo/db/concurrency/replication_state_transition_lock_guard.cpp index 540621d88c8..2c839a97967 100644 --- a/src/mongo/db/concurrency/replication_state_transition_lock_guard.cpp +++ b/src/mongo/db/concurrency/replication_state_transition_lock_guard.cpp @@ -50,12 +50,6 @@ ReplicationStateTransitionLockGuard::ReplicationStateTransitionLockGuard(Operati _enqueueLock(); } -ReplicationStateTransitionLockGuard::ReplicationStateTransitionLockGuard( - ReplicationStateTransitionLockGuard&& other) - : _opCtx(other._opCtx), _result(other._result) { - other._result = LOCK_INVALID; -} - ReplicationStateTransitionLockGuard::~ReplicationStateTransitionLockGuard() { _unlock(); } diff --git a/src/mongo/db/concurrency/replication_state_transition_lock_guard.h b/src/mongo/db/concurrency/replication_state_transition_lock_guard.h index 3dc48de025b..64107a74251 100644 --- a/src/mongo/db/concurrency/replication_state_transition_lock_guard.h +++ b/src/mongo/db/concurrency/replication_state_transition_lock_guard.h @@ -63,7 +63,7 @@ public: */ ReplicationStateTransitionLockGuard(OperationContext* opCtx, LockMode mode, EnqueueOnly); - ReplicationStateTransitionLockGuard(ReplicationStateTransitionLockGuard&&); + ReplicationStateTransitionLockGuard(ReplicationStateTransitionLockGuard&&) = delete; ReplicationStateTransitionLockGuard& operator=(ReplicationStateTransitionLockGuard&&) = delete; ~ReplicationStateTransitionLockGuard(); diff --git a/src/mongo/db/repl/replication_coordinator_impl_test.cpp b/src/mongo/db/repl/replication_coordinator_impl_test.cpp index 363b11f0362..d2ea171dbba 100644 --- a/src/mongo/db/repl/replication_coordinator_impl_test.cpp +++ b/src/mongo/db/repl/replication_coordinator_impl_test.cpp @@ -1592,7 +1592,8 @@ TEST_F(ReplCoordTest, ConcurrentStepDownShouldNotSignalTheSameFinishEventMoreTha // Prevent _stepDownFinish() from running and becoming secondary by blocking in this // exclusive task. const auto opCtx = makeOperationContext(); - boost::optional transitionGuard({opCtx.get(), MODE_X}); + boost::optional transitionGuard; + transitionGuard.emplace(opCtx.get(), MODE_X); TopologyCoordinator::UpdateTermResult termUpdated2; auto updateTermEvh2 = getReplCoord()->updateTerm_forTest(2, &termUpdated2); -- cgit v1.2.1