summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXiangyu Yao <xiangyu.yao@mongodb.com>2019-07-11 15:43:24 -0400
committerXiangyu Yao <xiangyu.yao@mongodb.com>2019-07-15 12:05:53 -0400
commitbb4ba528dd4254c33ac77026f94bc287b590ff3c (patch)
treeb9dcf19eef6090e5681888bb151e56d340940ebb
parentf8c69b361381a396f81c443438436e99c5af4970 (diff)
downloadmongo-bb4ba528dd4254c33ac77026f94bc287b590ff3c.tar.gz
SERVER-42153 Remove FCV gating for flow control
-rw-r--r--src/mongo/db/storage/flow_control.cpp9
1 files changed, 1 insertions, 8 deletions
diff --git a/src/mongo/db/storage/flow_control.cpp b/src/mongo/db/storage/flow_control.cpp
index df076e2d82c..71e0eff8b96 100644
--- a/src/mongo/db/storage/flow_control.cpp
+++ b/src/mongo/db/storage/flow_control.cpp
@@ -301,12 +301,6 @@ int FlowControl::getNumTickets() {
}
}
- // Flow Control is only enabled if FCV is 4.2.
- const bool isFCV42 =
- (serverGlobalParams.featureCompatibility.isVersionInitialized() &&
- serverGlobalParams.featureCompatibility.getVersion() ==
- ServerGlobalParams::FeatureCompatibility::Version::kFullyUpgradedTo42);
-
// It's important to update the topology on each iteration.
_updateTopologyData();
const repl::OpTimeAndWallTime myLastApplied = _replCoord->getMyLastAppliedOpTimeAndWallTime();
@@ -315,8 +309,7 @@ int FlowControl::getNumTickets() {
const std::int64_t locksUsedLastPeriod = _getLocksUsedLastPeriod();
if (serverGlobalParams.enableMajorityReadConcern == false ||
- gFlowControlEnabled.load() == false || isFCV42 == false || canAcceptWrites == false ||
- locksPerOp < 0.0) {
+ gFlowControlEnabled.load() == false || canAcceptWrites == false || locksPerOp < 0.0) {
_trimSamples(std::min(lastCommitted.opTime.getTimestamp(),
getMedianAppliedTimestamp(_prevMemberData)));
return _kMaxTickets;