From 1422edf755dba283ca300365977e379ddb75a4a7 Mon Sep 17 00:00:00 2001 From: David Storch Date: Tue, 8 Sep 2015 14:04:38 -0400 Subject: SERVER-20194 SERVER-18849 add support for querying SCCC mode config servers in the new mongos query path --- src/mongo/s/commands/cluster_is_master_cmd.cpp | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'src/mongo/s/commands/cluster_is_master_cmd.cpp') diff --git a/src/mongo/s/commands/cluster_is_master_cmd.cpp b/src/mongo/s/commands/cluster_is_master_cmd.cpp index e3e0dfbd84c..5104a6a1d78 100644 --- a/src/mongo/s/commands/cluster_is_master_cmd.cpp +++ b/src/mongo/s/commands/cluster_is_master_cmd.cpp @@ -72,20 +72,9 @@ public: result.appendNumber("maxWriteBatchSize", BatchedCommandRequest::kMaxWriteBatchSize); result.appendDate("localTime", jsTime()); - // Mongos can only send the wire version indicating find and getMore commands support if the - // config server mode has been upgraded to CSRS. - // - // TODO: This special case will no longer be required for 3.4. - auto catalogManager = grid.catalogManager(txn); - int maxVersionToSend = maxWireVersion; - if (maxVersionToSend == WireVersion::FIND_COMMAND && - catalogManager->getMode() != CatalogManager::ConfigServerMode::CSRS) { - maxVersionToSend = WireVersion::RELEASE_2_7_7; - } - // Mongos tries to keep exactly the same version range of the server for which // it is compiled. - result.append("maxWireVersion", maxVersionToSend); + result.append("maxWireVersion", maxWireVersion); result.append("minWireVersion", minWireVersion); return true; -- cgit v1.2.1