summaryrefslogtreecommitdiff
path: root/src/mongo
diff options
context:
space:
mode:
authorJudah Schvimer <judah@mongodb.com>2016-09-20 13:55:31 -0400
committerJudah Schvimer <judah@mongodb.com>2016-09-20 13:57:56 -0400
commit3117e5134a78ec59a3fbd30dfc5b82b850b6ce0c (patch)
tree771b88b87291a046227ac63581c4458896140712 /src/mongo
parentb461ee5d6fada090309004039b9736bbf41360eb (diff)
downloadmongo-3117e5134a78ec59a3fbd30dfc5b82b850b6ce0c.tar.gz
Revert "SERVER-24792 verify new mongos -> old mongod fails"
This reverts commit dc405959d785dc1f50682877d732da0124e4b3b2.
Diffstat (limited to 'src/mongo')
-rw-r--r--src/mongo/rpc/protocol.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mongo/rpc/protocol.cpp b/src/mongo/rpc/protocol.cpp
index ad4ec071cbd..90e7ad58389 100644
--- a/src/mongo/rpc/protocol.cpp
+++ b/src/mongo/rpc/protocol.cpp
@@ -144,7 +144,7 @@ StatusWith<ProtocolSetAndWireVersionInfo> parseProtocolSetFromIsMasterReply(
if (minWireVersion < 0 || maxWireVersion < 0 ||
minWireVersion >= std::numeric_limits<int>::max() ||
maxWireVersion >= std::numeric_limits<int>::max()) {
- return Status(ErrorCodes::IncompatibleServerVersion,
+ return Status(ErrorCodes::BadValue,
str::stream() << "Server min and max wire version have invalid values ("
<< minWireVersion
<< ","
@@ -186,7 +186,7 @@ Status validateWireVersion(const WireVersionInfo client, const WireVersionInfo s
// Server may return bad data.
if (server.minWireVersion > server.maxWireVersion) {
- return Status(ErrorCodes::IncompatibleServerVersion,
+ return Status(ErrorCodes::BadValue,
str::stream() << "Server min and max wire version are incorrect ("
<< server.minWireVersion
<< ","
@@ -198,7 +198,7 @@ Status validateWireVersion(const WireVersionInfo client, const WireVersionInfo s
// We assert the invariant that min < max above.
if (!(client.minWireVersion <= server.maxWireVersion &&
client.maxWireVersion >= server.minWireVersion)) {
- return Status(ErrorCodes::IncompatibleServerVersion,
+ return Status(ErrorCodes::BadValue,
str::stream() << "Server min and max wire version are incompatible ("
<< server.minWireVersion
<< ","