summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRenan Castro <renanccastro@gmail.com>2021-03-24 15:53:12 -0300
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2021-09-29 15:03:54 +0000
commit469c36d7b782256a854452f828627d1026d5c18e (patch)
tree6fbc43415dc27715f56dfe5d1be9ae768751c38d
parentfb8528b0306fa37216839519b41c2f8a927f6d18 (diff)
downloadmongo-469c36d7b782256a854452f828627d1026d5c18e.tar.gz
SERVER-59010 Fix SSL off build, OCSPManager shouldn't be used when ssl = off
-rw-r--r--src/mongo/db/db.cpp2
-rw-r--r--src/mongo/s/server.cpp2
-rw-r--r--src/mongo/shell/dbshell.cpp2
3 files changed, 6 insertions, 0 deletions
diff --git a/src/mongo/db/db.cpp b/src/mongo/db/db.cpp
index 5eb13891fa7..c9a712f97cb 100644
--- a/src/mongo/db/db.cpp
+++ b/src/mongo/db/db.cpp
@@ -339,7 +339,9 @@ ExitCode _initAndListen(ServiceContext* serviceContext, int listenPort) {
auto runner = makePeriodicRunner(serviceContext);
serviceContext->setPeriodicRunner(std::move(runner));
+#ifdef MONGO_CONFIG_SSL
OCSPManager::get()->startThreadPool();
+#endif
if (!storageGlobalParams.repair) {
auto tl =
diff --git a/src/mongo/s/server.cpp b/src/mongo/s/server.cpp
index e2f3550486c..41d2327ad2c 100644
--- a/src/mongo/s/server.cpp
+++ b/src/mongo/s/server.cpp
@@ -640,7 +640,9 @@ ExitCode runMongosServer(ServiceContext* serviceContext) {
serviceContext->setPeriodicRunner(std::move(runner));
}
+#ifdef MONGO_CONFIG_SSL
OCSPManager::get()->startThreadPool();
+#endif
serviceContext->setServiceEntryPoint(std::make_unique<ServiceEntryPointMongos>(serviceContext));
diff --git a/src/mongo/shell/dbshell.cpp b/src/mongo/shell/dbshell.cpp
index 9fc8a96911b..cdaff940c69 100644
--- a/src/mongo/shell/dbshell.cpp
+++ b/src/mongo/shell/dbshell.cpp
@@ -728,7 +728,9 @@ int _main(int argc, char* argv[], char** envp) {
// TODO This should use a TransportLayerManager or TransportLayerFactory
auto serviceContext = getGlobalServiceContext();
+#ifdef MONGO_CONFIG_SSL
OCSPManager::get()->startThreadPool();
+#endif
transport::TransportLayerASIO::Options opts;
opts.enableIPv6 = shellGlobalParams.enableIPv6;