summaryrefslogtreecommitdiff
path: root/src/mongo/db/mongod_main.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mongo/db/mongod_main.cpp')
-rw-r--r--src/mongo/db/mongod_main.cpp23
1 files changed, 1 insertions, 22 deletions
diff --git a/src/mongo/db/mongod_main.cpp b/src/mongo/db/mongod_main.cpp
index 368c7605491..553ef9843bd 100644
--- a/src/mongo/db/mongod_main.cpp
+++ b/src/mongo/db/mongod_main.cpp
@@ -734,16 +734,7 @@ ExitCode _initAndListen(ServiceContext* serviceContext, int listenPort) {
// operation context anymore
startupOpCtx.reset();
- auto start = serviceContext->getServiceExecutor()->start();
- if (!start.isOK()) {
- LOGV2_ERROR(20570,
- "Error starting service executor: {error}",
- "Error starting service executor",
- "error"_attr = start);
- return EXIT_NET_ERROR;
- }
-
- start = serviceContext->getServiceEntryPoint()->start();
+ auto start = serviceContext->getServiceEntryPoint()->start();
if (!start.isOK()) {
LOGV2_ERROR(20571,
"Error starting service entry point: {error}",
@@ -1279,18 +1270,6 @@ void shutdownTask(const ShutdownTaskArgs& shutdownArgs) {
"Service entry point did not shutdown within the time limit");
}
}
-
- // Shutdown and wait for the service executor to exit
- if (auto svcExec = serviceContext->getServiceExecutor()) {
- LOGV2_OPTIONS(4784924, {LogComponent::kExecutor}, "Shutting down the service executor");
- Status status = svcExec->shutdown(Seconds(10));
- if (!status.isOK()) {
- LOGV2_OPTIONS(20564,
- {LogComponent::kNetwork},
- "Service executor did not shutdown within the time limit",
- "error"_attr = status);
- }
- }
#endif
LOGV2(4784925, "Shutting down free monitoring");