From bb4ba528dd4254c33ac77026f94bc287b590ff3c Mon Sep 17 00:00:00 2001
From: Xiangyu Yao <xiangyu.yao@mongodb.com>
Date: Thu, 11 Jul 2019 15:43:24 -0400
Subject: SERVER-42153 Remove FCV gating for flow control

---
 src/mongo/db/storage/flow_control.cpp | 9 +--------
 1 file changed, 1 insertion(+), 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;
-- 
cgit v1.2.1