diff options
Diffstat (limited to 'src/mongo/dbtests/replica_set_monitor_test.cpp')
-rw-r--r-- | src/mongo/dbtests/replica_set_monitor_test.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/mongo/dbtests/replica_set_monitor_test.cpp b/src/mongo/dbtests/replica_set_monitor_test.cpp index 526977cb169..d6454fc50c2 100644 --- a/src/mongo/dbtests/replica_set_monitor_test.cpp +++ b/src/mongo/dbtests/replica_set_monitor_test.cpp @@ -93,11 +93,10 @@ TEST_F(ReplicaSetMonitorTest, SeedWithPriOnlySecDown) { const string replSetName(replSet->getSetName()); set<HostAndPort> seedList; seedList.insert(HostAndPort(replSet->getPrimary())); - ReplicaSetMonitor::createIfNeeded(replSetName, seedList); + auto monitor = ReplicaSetMonitor::createIfNeeded(replSetName, seedList); replSet->kill(replSet->getPrimary()); - ReplicaSetMonitorPtr monitor = ReplicaSetMonitor::get(replSet->getSetName()); // Trigger calls to Node::getConnWithRefresh monitor->startOrContinueRefresh().refreshAll(); monitor.reset(); @@ -148,10 +147,9 @@ TEST(ReplicaSetMonitorTest, PrimaryRemovedFromSetStress) { const string replSetName(replSet.getSetName()); set<HostAndPort> seedList; seedList.insert(HostAndPort(replSet.getPrimary())); - ReplicaSetMonitor::createIfNeeded(replSetName, seedList); + auto replMonitor = ReplicaSetMonitor::createIfNeeded(replSetName, seedList); const repl::ReplicaSetConfig& origConfig = replSet.getReplConfig(); - mongo::ReplicaSetMonitorPtr replMonitor = ReplicaSetMonitor::get(replSetName); for (size_t idxToRemove = 0; idxToRemove < NODE_COUNT; idxToRemove++) { replSet.setConfig(origConfig); @@ -259,12 +257,11 @@ TEST_F(TwoNodeWithTags, SecDownRetryNoTag) { set<HostAndPort> seedList; seedList.insert(HostAndPort(replSet->getPrimary())); - ReplicaSetMonitor::createIfNeeded(replSet->getSetName(), seedList); + auto monitor = ReplicaSetMonitor::createIfNeeded(replSet->getSetName(), seedList); const string secHost(replSet->getSecondaries().front()); replSet->kill(secHost); - ReplicaSetMonitorPtr monitor = ReplicaSetMonitor::get(replSet->getSetName()); // Make sure monitor sees the dead secondary monitor->startOrContinueRefresh().refreshAll(); @@ -286,12 +283,11 @@ TEST_F(TwoNodeWithTags, SecDownRetryWithTag) { set<HostAndPort> seedList; seedList.insert(HostAndPort(replSet->getPrimary())); - ReplicaSetMonitor::createIfNeeded(replSet->getSetName(), seedList); + auto monitor = ReplicaSetMonitor::createIfNeeded(replSet->getSetName(), seedList); const string secHost(replSet->getSecondaries().front()); replSet->kill(secHost); - ReplicaSetMonitorPtr monitor = ReplicaSetMonitor::get(replSet->getSetName()); // Make sure monitor sees the dead secondary monitor->startOrContinueRefresh().refreshAll(); |