Guard against attempting to create empty thread pool

1 files changed, 11 insertions, 9 deletions

diff --git a/searchcore/src/vespa/searchcore/proton/server/proton.cpp b/searchcore/src/vespa/searchcore/proton/server/proton.cpp
index 7b27ba2fa3a..4ba8eb130a4 100644
--- a/searchcore/src/vespa/searchcore/proton/server/proton.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/proton.cpp
@@ -450,17 +450,19 @@ Proton::~Proton()
     if (_fs4Server) {
         _fs4Server->shutDown();
     }
-    // size_t numCores = _protonConfigurer.getActiveConfigSnapshot()->getBootstrapConfig()->getHwInfo().cpu().cores();
-    size_t numCores = 4;
-    const std::shared_ptr<proton::ProtonConfigSnapshot> pcsp = _protonConfigurer.getActiveConfigSnapshot();
-    if (pcsp) {
-        const std::shared_ptr<proton::BootstrapConfig> bcp = pcsp->getBootstrapConfig();
-        if (bcp) {
-            numCores = bcp->getHwInfo().cpu().cores();
+    if (_documentDBMap.size() > 0) {
+        size_t numCores = 4;
+        const std::shared_ptr<proton::ProtonConfigSnapshot> pcsp = _protonConfigurer.getActiveConfigSnapshot();
+        if (pcsp) {
+            const std::shared_ptr<proton::BootstrapConfig> bcp = pcsp->getBootstrapConfig();
+            if (bcp) {
+                numCores = std::max(bcp->getHwInfo().cpu().cores(), 1);
+            }
         }
+
+        vespalib::ThreadStackExecutor closePool(std::min(_documentDBMap.size(), numCores), 0x20000, close_executor);
+        closeDocumentDBs(closePool);
     }
-    vespalib::ThreadStackExecutor closePool(std::min(_documentDBMap.size(), numCores), 0x20000, close_executor);
-    closeDocumentDBs(closePool);
     _documentDBMap.clear();
     _persistenceEngine.reset();
     _tls.reset();