Merge pull request #4510 from vespa-engine/arnej/remove-from-db-if-all-nodes-down

guard against empty set of nodes

1 files changed, 5 insertions, 0 deletions

diff --git a/storage/src/vespa/storage/distributor/distributorcomponent.cpp b/storage/src/vespa/storage/distributor/distributorcomponent.cpp
index f0643eec37e..ac6a2957052 100644
--- a/storage/src/vespa/storage/distributor/distributorcomponent.cpp
+++ b/storage/src/vespa/storage/distributor/distributorcomponent.cpp
@@ -281,6 +281,11 @@ DistributorComponent::updateBucketDatabase(
     if (updateFlags & DatabaseUpdate::RESET_TRUSTED) {
         dbentry->resetTrusted();
     }
+    if (dbentry->getNodeCount() == 0) {
+        LOG(warning, "all nodes in changedNodes set (size %zu) are down, removing dbentry", changedNodes.size());
+        bucketSpace.getBucketDatabase().remove(bucket.getBucketId());
+        return;
+    }
     bucketSpace.getBucketDatabase().update(dbentry);
 }