summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavi Vetriselvan <pavithra.vetriselvan@mongodb.com>2020-09-22 12:09:56 -0400
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2020-10-06 15:54:17 +0000
commit49e15292df209e0e67daa5a75f8953286b1aaafd (patch)
treecee453652e03cd15f9a3df013c80fc948f4b5b69
parent084d4ae692bd2e5d804545a1745e50ecc485b797 (diff)
downloadmongo-49e15292df209e0e67daa5a75f8953286b1aaafd.tar.gz
SERVER-50415 rename waitInIsMaster failpoint to waitInHello
(cherry picked from commit 861970ebd4f54a5feb23f82e2db3e9e00b0b32c1) (cherry picked from commit a2716379a0cbd578a314498d84d755892503f6ab)
-rw-r--r--jstests/noPassthrough/set_step_params.js8
-rw-r--r--src/mongo/db/repl/replication_info.cpp4
2 files changed, 6 insertions, 6 deletions
diff --git a/jstests/noPassthrough/set_step_params.js b/jstests/noPassthrough/set_step_params.js
index 88d1e532c1e..cb532bdb9eb 100644
--- a/jstests/noPassthrough/set_step_params.js
+++ b/jstests/noPassthrough/set_step_params.js
@@ -184,7 +184,7 @@ runSubTest("MaxConnecting", function() {
ShardingTaskExecutorPoolMaxConnecting: maxPending1,
});
- configureReplSetFailpoint("waitInIsMaster", "alwaysOn");
+ configureReplSetFailpoint("waitInHello", "alwaysOn");
configureReplSetFailpoint("waitInFindBeforeMakingBatch", "alwaysOn");
dropConnections();
@@ -205,7 +205,7 @@ runSubTest("MaxConnecting", function() {
hasConnPoolStats({pending: maxPending2});
// Release our pending and walk away
- configureReplSetFailpoint("waitInIsMaster", "off");
+ configureReplSetFailpoint("waitInHello", "off");
hasConnPoolStats({
// Expects the number of pending connections to be zero.
checkStatsFunc: function(stats) {
@@ -242,7 +242,7 @@ runSubTest("Timeouts", function() {
hasConnPoolStats({ready: conns});
// Block refreshes and wait for the toRefresh timeout
- configureReplSetFailpoint("waitInIsMaster", "alwaysOn");
+ configureReplSetFailpoint("waitInHello", "alwaysOn");
sleep(toRefreshTimeoutMS);
// Confirm that we're in pending for all of our conns
@@ -257,7 +257,7 @@ runSubTest("Timeouts", function() {
sleep(pendingTimeoutMS);
hasConnPoolStats({});
- configureReplSetFailpoint("waitInIsMaster", "off");
+ configureReplSetFailpoint("waitInHello", "off");
// Reset the min conns to make sure normal refresh doesn't extend the timeout
updateSetParameters({
diff --git a/src/mongo/db/repl/replication_info.cpp b/src/mongo/db/repl/replication_info.cpp
index b42f20365b1..594baf38b59 100644
--- a/src/mongo/db/repl/replication_info.cpp
+++ b/src/mongo/db/repl/replication_info.cpp
@@ -65,7 +65,7 @@
namespace mongo {
-MONGO_FAIL_POINT_DEFINE(waitInIsMaster);
+MONGO_FAIL_POINT_DEFINE(waitInHello);
using std::list;
using std::string;
@@ -252,7 +252,7 @@ public:
BSONObjBuilder& result) final {
CommandHelpers::handleMarkKillOnClientDisconnect(opCtx);
- MONGO_FAIL_POINT_PAUSE_WHILE_SET_OR_INTERRUPTED(opCtx, waitInIsMaster);
+ MONGO_FAIL_POINT_PAUSE_WHILE_SET_OR_INTERRUPTED(opCtx, waitInHello);
/* currently request to arbiter is (somewhat arbitrarily) an ismaster request that is not
authenticated.