diff options
author | Lingzhi Deng <lingzhi.deng@mongodb.com> | 2019-09-25 15:48:31 +0000 |
---|---|---|
committer | evergreen <evergreen@mongodb.com> | 2019-09-25 15:48:31 +0000 |
commit | e4139a8394fb7d35503a0b559fc90723f7ab9de7 (patch) | |
tree | 3545fc104e2ae2fe9e21e2f61f29bcc34b2f22ef /src/mongo | |
parent | 50bd132c51b25e74221a90f214b013bd0ea014e1 (diff) | |
download | mongo-e4139a8394fb7d35503a0b559fc90723f7ab9de7.tar.gz |
SERVER-43330 Remove ReplicationStateTransitionLockGuard move constructor
Diffstat (limited to 'src/mongo')
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 198e54e0c2b..8ee3c37bbf5 100644 --- a/src/mongo/db/repl/replication_coordinator_impl_test.cpp +++ b/src/mongo/db/repl/replication_coordinator_impl_test.cpp @@ -1584,7 +1584,8 @@ TEST_F(ReplCoordTest, ConcurrentStepDownShouldNotSignalTheSameFinishEventMoreTha // Prevent _stepDownFinish() from running and becoming secondary by blocking in this // exclusive task. const auto opCtx = makeOperationContext(); - boost::optional<ReplicationStateTransitionLockGuard> transitionGuard({opCtx.get(), MODE_X}); + boost::optional<ReplicationStateTransitionLockGuard> transitionGuard; + transitionGuard.emplace(opCtx.get(), MODE_X); TopologyCoordinator::UpdateTermResult termUpdated2; auto updateTermEvh2 = getReplCoord()->updateTerm_forTest(2, &termUpdated2); |