summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Morrow <acm@mongodb.com>2019-02-28 12:43:06 -0500
committerAndrew Morrow <acm@mongodb.com>2019-03-11 12:59:07 -0400
commit2c0bebbfe5d458f5bef25ab28c12227402caa6cb (patch)
treed4e8bb801e710c7cc7d97f0d2fa37886503c4c64
parentdf7c2a4a8c4a9069d84f62967c896b0220c82f15 (diff)
downloadmongo-2c0bebbfe5d458f5bef25ab28c12227402caa6cb.tar.gz
SERVER-38503 Empty networkMessageCompressors is an error
-rw-r--r--jstests/noPassthrough/compression_options.js1
-rw-r--r--src/mongo/shell/shell_options.cpp6
-rw-r--r--src/mongo/transport/message_compressor_options_client.idl1
-rw-r--r--src/mongo/transport/message_compressor_options_server.idl1
4 files changed, 2 insertions, 7 deletions
diff --git a/jstests/noPassthrough/compression_options.js b/jstests/noPassthrough/compression_options.js
index 0a22bc1e1ba..c6f4ccadc68 100644
--- a/jstests/noPassthrough/compression_options.js
+++ b/jstests/noPassthrough/compression_options.js
@@ -39,6 +39,5 @@
runTest("snappy", ["snappy"]);
runTest("disabled", undefined);
- runTest("", undefined);
}());
diff --git a/src/mongo/shell/shell_options.cpp b/src/mongo/shell/shell_options.cpp
index 61820b12325..857a6003ac1 100644
--- a/src/mongo/shell/shell_options.cpp
+++ b/src/mongo/shell/shell_options.cpp
@@ -152,10 +152,8 @@ Status storeMongoShellOptions(const moe::Environment& params,
}
if (params.count("net.compression.compressors")) {
- auto compressors = params["net.compression.compressors"].as<string>();
- if (compressors != "disabled") {
- shellGlobalParams.networkMessageCompressors = std::move(compressors);
- }
+ shellGlobalParams.networkMessageCompressors =
+ params["net.compression.compressors"].as<string>();
}
if (params.count("nodb")) {
diff --git a/src/mongo/transport/message_compressor_options_client.idl b/src/mongo/transport/message_compressor_options_client.idl
index 6c824a00637..f575716630b 100644
--- a/src/mongo/transport/message_compressor_options_client.idl
+++ b/src/mongo/transport/message_compressor_options_client.idl
@@ -35,6 +35,5 @@ configs:
source: [ cli, ini, yaml ]
arg_vartype: String
short_name: networkMessageCompressors
- implicit: disabled
default: disabled
hidden: true
diff --git a/src/mongo/transport/message_compressor_options_server.idl b/src/mongo/transport/message_compressor_options_server.idl
index 0e712fbe6c2..9df1cd34343 100644
--- a/src/mongo/transport/message_compressor_options_server.idl
+++ b/src/mongo/transport/message_compressor_options_server.idl
@@ -35,5 +35,4 @@ configs:
source: [ cli, ini, yaml ]
arg_vartype: String
short_name: networkMessageCompressors
- implicit: disabled
default: 'snappy,zstd,zlib'