Simplify some distribution-enabling code

Also ensure main bucket space classes are non-copyable/movable

4 files changed, 16 insertions, 6 deletions

diff --git a/storage/src/tests/distributor/bucketdbupdatertest.cpp b/storage/src/tests/distributor/bucketdbupdatertest.cpp
index cd3658fc163..5d000397ca5 100644
--- a/storage/src/tests/distributor/bucketdbupdatertest.cpp
+++ b/storage/src/tests/distributor/bucketdbupdatertest.cpp
@@ -423,8 +423,8 @@ public:
     }
 
     void setDistribution(const std::string& distConfig) {
-        auto distribution = std::make_shared<lib::Distribution>(distConfig);
-        triggerDistributionChange(std::move(distribution));
+        triggerDistributionChange(
+                std::make_shared<lib::Distribution>(distConfig));
     }
 
     std::string getDistConfig6Nodes3Groups() const {
@@ -2255,8 +2255,8 @@ BucketDBUpdaterTest::clusterConfigDownsizeOnlySendsToAvailableNodes()
     // Intentionally trigger a racing config change which arrives before the
     // new cluster state representing it.
     std::string distConfig(getDistConfig3Nodes1Group());
-    _node->getComponentRegister().setDistribution(
-            std::make_shared<lib::Distribution>(distConfig));
+    triggerDistributionChange(
+        std::make_shared<lib::Distribution>(distConfig));
     sortSentMessagesByIndex(_sender);
 
     CPPUNIT_ASSERT_EQUAL((nodeVec{0, 1, 2}), getSendSet());
@@ -2305,8 +2305,7 @@ BucketDBUpdaterTest::nodeMissingFromConfigIsTreatedAsNeedingOwnershipTransfer()
         "group[1].nodes[0].index 0\n"
         "group[1].nodes[1].index 1\n";
 
-    _node->getComponentRegister().setDistribution(
-            std::make_shared<lib::Distribution>(downsizeCfg));
+    triggerDistributionChange(std::make_shared<lib::Distribution>(downsizeCfg));
     sortSentMessagesByIndex(_sender);
     _sender.clear();
 
diff --git a/storage/src/tests/distributor/distributortestutil.h b/storage/src/tests/distributor/distributortestutil.h
index fe7809e5ba6..b7375be8e98 100644
--- a/storage/src/tests/distributor/distributortestutil.h
+++ b/storage/src/tests/distributor/distributortestutil.h
@@ -135,6 +135,7 @@ public:
         return _config;
     }
 
+    // TODO explicit notion of bucket spaces for tests
     BucketDatabase& getBucketDatabase() {
         return _distributor->getDefaultBucketSpace().getBucketDatabase();
     }
diff --git a/storage/src/vespa/storage/distributor/managed_bucket_space.h b/storage/src/vespa/storage/distributor/managed_bucket_space.h
index 8a9ffcc9802..e649adc7744 100644
--- a/storage/src/vespa/storage/distributor/managed_bucket_space.h
+++ b/storage/src/vespa/storage/distributor/managed_bucket_space.h
@@ -31,6 +31,11 @@ public:
     ManagedBucketSpace();
     ~ManagedBucketSpace();
 
+    ManagedBucketSpace(const ManagedBucketSpace&) = delete;
+    ManagedBucketSpace& operator=(const ManagedBucketSpace&) = delete;
+    ManagedBucketSpace(ManagedBucketSpace&&) = delete;
+    ManagedBucketSpace& operator=(ManagedBucketSpace&&) = delete;
+
     MapBucketDatabase& getBucketDatabase() noexcept {
         return _bucketDatabase;
     }
diff --git a/storage/src/vespa/storage/distributor/managed_bucket_space_repo.h b/storage/src/vespa/storage/distributor/managed_bucket_space_repo.h
index a1299908626..eda19eea609 100644
--- a/storage/src/vespa/storage/distributor/managed_bucket_space_repo.h
+++ b/storage/src/vespa/storage/distributor/managed_bucket_space_repo.h
@@ -15,6 +15,11 @@ public:
     ManagedBucketSpaceRepo();
     ~ManagedBucketSpaceRepo();
 
+    ManagedBucketSpaceRepo(const ManagedBucketSpaceRepo&&) = delete;
+    ManagedBucketSpaceRepo& operator=(const ManagedBucketSpaceRepo&) = delete;
+    ManagedBucketSpaceRepo(ManagedBucketSpaceRepo&&) = delete;
+    ManagedBucketSpaceRepo& operator=(ManagedBucketSpaceRepo&&) = delete;
+
     ManagedBucketSpace& getDefaultSpace() noexcept { return _defaultSpace; }
     const ManagedBucketSpace& getDefaultSpace() const noexcept {
         return _defaultSpace;