summaryrefslogtreecommitdiff
path: root/src/mongo/db/repl/sync_source_feedback.cpp
diff options
context:
space:
mode:
authorJudah Schvimer <judah@mongodb.com>2018-01-22 16:14:30 -0500
committerJudah Schvimer <judah@mongodb.com>2018-01-22 16:14:30 -0500
commitf3b504948c0cef40deffb4786ebdda6797625142 (patch)
tree7a2d0b540d7915dc50b6c5cfc1696ef25e0c57c5 /src/mongo/db/repl/sync_source_feedback.cpp
parentc376f4b80d26028b6a8746f8545a35e390b59bf2 (diff)
downloadmongo-f3b504948c0cef40deffb4786ebdda6797625142.tar.gz
SERVER-32794 Make timeouts unrelated to elections not depend on election timeout
Diffstat (limited to 'src/mongo/db/repl/sync_source_feedback.cpp')
-rw-r--r--src/mongo/db/repl/sync_source_feedback.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mongo/db/repl/sync_source_feedback.cpp b/src/mongo/db/repl/sync_source_feedback.cpp
index 4bd190ff14e..e14abcc8eed 100644
--- a/src/mongo/db/repl/sync_source_feedback.cpp
+++ b/src/mongo/db/repl/sync_source_feedback.cpp
@@ -49,11 +49,13 @@ namespace repl {
namespace {
+const Milliseconds maximumKeepAliveIntervalMS(30 * 1000);
+
/**
* Calculates the keep alive interval based on the given ReplSetConfig.
*/
Milliseconds calculateKeepAliveInterval(const ReplSetConfig& rsConfig) {
- return rsConfig.getElectionTimeoutPeriod() / 2;
+ return std::min((rsConfig.getElectionTimeoutPeriod() / 2), maximumKeepAliveIntervalMS);
}
/**