Implicitly enable multiple bucket spaces in content backend

Config can still force new protocol version to be used even if
version handshake indicates it should not be.

1 files changed, 3 insertions, 7 deletions

diff --git a/storage/src/vespa/storage/storageserver/storagenode.cpp b/storage/src/vespa/storage/storageserver/storagenode.cpp
index ad98d64b173..6bb2ca31ec1 100644
--- a/storage/src/vespa/storage/storageserver/storagenode.cpp
+++ b/storage/src/vespa/storage/storageserver/storagenode.cpp
@@ -206,10 +206,8 @@ StorageNode::initialize()
 
     _chain.reset(createChain().release());
 
-    if (_component->enableMultipleBucketSpaces()) {
-        assert(_communicationManager != nullptr);
-        _communicationManager->updateBucketSpacesConfig(*_bucketSpacesConfig);
-    }
+    assert(_communicationManager != nullptr);
+    _communicationManager->updateBucketSpacesConfig(*_bucketSpacesConfig);
 
     // Start the metric manager, such that it starts generating snapshots
     // and the like. Note that at this time, all metrics should hopefully
@@ -359,9 +357,7 @@ StorageNode::handleLiveConfigUpdate(const InitialGuard & initGuard)
     if (_newBucketSpacesConfig) {
         _bucketSpacesConfig = std::move(_newBucketSpacesConfig);
         _context.getComponentRegister().setBucketSpacesConfig(*_bucketSpacesConfig);
-        if (_component->enableMultipleBucketSpaces()) {
-            _communicationManager->updateBucketSpacesConfig(*_bucketSpacesConfig);
-        }
+        _communicationManager->updateBucketSpacesConfig(*_bucketSpacesConfig);
     }
 }