diff options
author | Jason Carey <jcarey@argv.me> | 2018-12-20 10:45:35 -0500 |
---|---|---|
committer | Daniel Gottlieb <daniel.gottlieb@mongodb.com> | 2019-01-15 08:54:38 -0500 |
commit | 04c72f98a31ea1824acbacb1accb6a1672e6a2db (patch) | |
tree | 8ce743456a909edb2caefcb12b1f2ab3ab0ba85e | |
parent | 72dfba52dab035df80e5e3f06db39c66e1656814 (diff) | |
download | mongo-04c72f98a31ea1824acbacb1accb6a1672e6a2db.tar.gz |
SERVER-38177 Fix --repair with --bind_ip
Setting bind ips in server global params causes an error when spinning
up an egress only transport layer. It's more appropriate in that case
to ignore the bind ips.
(cherry picked from commit 94f6c4d2832e4ec88b30045ceb1907af54725c78)
-rw-r--r-- | jstests/disk/libs/wt_file_helper.js | 2 | ||||
-rw-r--r-- | src/mongo/transport/transport_layer_manager.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/jstests/disk/libs/wt_file_helper.js b/jstests/disk/libs/wt_file_helper.js index 143e4e08b2e..54e7781608d 100644 --- a/jstests/disk/libs/wt_file_helper.js +++ b/jstests/disk/libs/wt_file_helper.js @@ -49,7 +49,7 @@ let assertQueryUsesIndex = function(coll, query, indexName) { * Assert that running MongoDB with --repair on the provided dbpath exits cleanly. */ let assertRepairSucceeds = function(dbpath, port, opts) { - let args = ["mongod", "--repair", "--port", port, "--dbpath", dbpath]; + let args = ["mongod", "--repair", "--port", port, "--dbpath", dbpath, "--bind_ip_all"]; for (let a in opts) { if (opts.hasOwnProperty(a)) args.push("--" + a); diff --git a/src/mongo/transport/transport_layer_manager.cpp b/src/mongo/transport/transport_layer_manager.cpp index de36bb2e61f..2d3f7146775 100644 --- a/src/mongo/transport/transport_layer_manager.cpp +++ b/src/mongo/transport/transport_layer_manager.cpp @@ -121,6 +121,7 @@ Status TransportLayerManager::addAndStartTransportLayer(std::unique_ptr<Transpor std::unique_ptr<TransportLayer> TransportLayerManager::makeAndStartDefaultEgressTransportLayer() { transport::TransportLayerASIO::Options opts(&serverGlobalParams); opts.mode = transport::TransportLayerASIO::Options::kEgress; + opts.ipList.clear(); auto ret = stdx::make_unique<transport::TransportLayerASIO>(opts, nullptr); uassertStatusOK(ret->setup()); |