Assert when closing down.

2 files changed, 2 insertions, 12 deletions

diff --git a/filedistribution/src/vespa/filedistribution/common/componentsdeleter.cpp b/filedistribution/src/vespa/filedistribution/common/componentsdeleter.cpp
index 053073b26e5..3c6a265941a 100644
--- a/filedistribution/src/vespa/filedistribution/common/componentsdeleter.cpp
+++ b/filedistribution/src/vespa/filedistribution/common/componentsdeleter.cpp
@@ -48,8 +48,8 @@ ComponentsDeleter::waitForAllComponentsDeleted()
             std::this_thread::sleep_for(100ms);
     }
     LOG(debug, "Done waiting for all components to be deleted");
-
-    logNotDeletedComponents();
+    assert(_trackedComponents.empty());
+    assert(_deleteRequests.empty());
 }
  
 void
@@ -70,15 +70,6 @@ ComponentsDeleter::areWeDone()
 }
 
 void
-ComponentsDeleter::logNotDeletedComponents()
-{
-    LockGuard guard(_trackedComponentsMutex);
-    for (const auto & component : _trackedComponents) {
-        LOG(info, "Timed out waiting for component '%s' to be deleted", component.second.c_str());
-    }
-}
-
-void
 ComponentsDeleter::removeFromTrackedComponents(void* component) {
     LockGuard guard(_trackedComponentsMutex);
     if (_trackedComponents.count(component))
diff --git a/filedistribution/src/vespa/filedistribution/common/componentsdeleter.h b/filedistribution/src/vespa/filedistribution/common/componentsdeleter.h
index 277084e28b3..46d79663536 100644
--- a/filedistribution/src/vespa/filedistribution/common/componentsdeleter.h
+++ b/filedistribution/src/vespa/filedistribution/common/componentsdeleter.h
@@ -44,7 +44,6 @@ class ComponentsDeleter {
 
     void waitForAllComponentsDeleted();
     bool areWeDone();
-    void logNotDeletedComponents();
     void close();
   public:
     ComponentsDeleter(const ComponentsDeleter &) = delete;