diff options
| author | Ben Caimano <ben.caimano@10gen.com> | 2020-09-11 20:09:59 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-09-14 04:57:01 +0000 |
| commit | 827a25eb01bc5ddf766b3a543ef0ba5112953e1b (patch) | |
| tree | 504935db5b1292818dcd9b862bf8b5c3b4352fb5 /src/mongo/tools | |
| parent | bd320bc2d10cff75756a2c95986cc81ec8a5e7c7 (diff) | |
| download | mongo-827a25eb01bc5ddf766b3a543ef0ba5112953e1b.tar.gz | |
SERVER-50867 Roll back ServiceStateMachine changes temporarily
This reverts these commits:
b039b24746e1d1fb10a32e1ca4831423c01d4cd7: SERVER-48980
97e16187ff3065d242a61a52e7b6edd4d439fb30: SERVER-49072
0607a6c291bf4cf4580a4444d826ed3c3ac3df47: SERVER-49104
Diffstat (limited to 'src/mongo/tools')
| -rw-r--r-- | src/mongo/tools/bridge.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/mongo/tools/bridge.cpp b/src/mongo/tools/bridge.cpp index 1c2f7d46bc9..986114093ed 100644 --- a/src/mongo/tools/bridge.cpp +++ b/src/mongo/tools/bridge.cpp @@ -485,9 +485,10 @@ int bridgeMain(int argc, char** argv) { setGlobalServiceContext(ServiceContext::make()); auto serviceContext = getGlobalServiceContext(); serviceContext->setServiceEntryPoint(std::make_unique<ServiceEntryPointBridge>(serviceContext)); - if (auto status = serviceContext->getServiceEntryPoint()->start(); !status.isOK()) { - LOGV2(4907203, "Error starting service entry point", "error"_attr = status); - } + serviceContext->setServiceExecutor( + std::make_unique<transport::ServiceExecutorSynchronous>(serviceContext)); + + fassert(50766, serviceContext->getServiceExecutor()->start()); transport::TransportLayerASIO::Options opts; opts.ipList.emplace_back("0.0.0.0"); @@ -496,13 +497,13 @@ int bridgeMain(int argc, char** argv) { serviceContext->setTransportLayer(std::make_unique<mongo::transport::TransportLayerASIO>( opts, serviceContext->getServiceEntryPoint())); auto tl = serviceContext->getTransportLayer(); - if (auto status = tl->setup(); !status.isOK()) { - LOGV2(22922, "Error setting up transport layer", "error"_attr = status); + if (!tl->setup().isOK()) { + LOGV2(22922, "Error setting up transport layer"); return EXIT_NET_ERROR; } - if (auto status = tl->start(); !status.isOK()) { - LOGV2(22923, "Error starting transport layer", "error"_attr = status); + if (!tl->start().isOK()) { + LOGV2(22923, "Error starting transport layer"); return EXIT_NET_ERROR; } |