Remove experimental enable-multiple-bucket-spaces flag.

The feature has been default on since late May 2018.

3 files changed, 3 insertions, 14 deletions

diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetController.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetController.java
index 56fe679fc6a..005bf7971a5 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetController.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetController.java
@@ -463,14 +463,9 @@ public class FleetController implements NodeStateOrHostInfoChangeHandler, NodeAd
             cluster.setSlobrokGenerationCount(0);
         }
 
-        // TODO don't hardcode bucket spaces
-        if (options.enableMultipleBucketSpaces) {
-            configuredBucketSpaces = Collections.unmodifiableSet(
-                    Stream.of(FixedBucketSpaces.defaultSpace(), FixedBucketSpaces.globalSpace())
-                            .collect(Collectors.toSet()));
-        } else {
-            configuredBucketSpaces = Collections.emptySet();
-        }
+        configuredBucketSpaces = Collections.unmodifiableSet(
+                Stream.of(FixedBucketSpaces.defaultSpace(), FixedBucketSpaces.globalSpace())
+                        .collect(Collectors.toSet()));
         stateVersionTracker.setMinMergeCompletionRatio(options.minMergeCompletionRatio);
 
         communicator.propagateOptions(options);
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetControllerOptions.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetControllerOptions.java
index 31268e78338..e069dde1901 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetControllerOptions.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetControllerOptions.java
@@ -119,9 +119,6 @@ public class FleetControllerOptions implements Cloneable {
 
     private Duration maxDeferredTaskVersionWaitTime = Duration.ofSeconds(30);
 
-    // TODO replace this flag with a set of bucket spaces instead
-    public boolean enableMultipleBucketSpaces = false;
-
     public boolean clusterHasGlobalDocumentTypes = false;
 
     // TODO: Choose a default value
@@ -233,7 +230,6 @@ public class FleetControllerOptions implements Cloneable {
         sb.append("<tr><td><nobr>Maximum node event log size</nobr></td><td align=\"right\">").append(eventNodeLogMaxSize).append("</td></tr>");
         sb.append("<tr><td><nobr>Wanted distribution bits</nobr></td><td align=\"right\">").append(distributionBits).append("</td></tr>");
         sb.append("<tr><td><nobr>Max deferred task version wait time</nobr></td><td align=\"right\">").append(maxDeferredTaskVersionWaitTime.toMillis()).append("ms</td></tr>");
-        sb.append("<tr><td><nobr>Multiple bucket spaces enabled</nobr></td><td align=\"right\">").append(enableMultipleBucketSpaces).append("</td></tr>");
         sb.append("<tr><td><nobr>Cluster has global document types configured</nobr></td><td align=\"right\">").append(clusterHasGlobalDocumentTypes).append("</td></tr>");
 
         sb.append("</table>");
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/MasterElectionTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/MasterElectionTest.java
index 07d176745bc..9d6e39f244a 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/MasterElectionTest.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/MasterElectionTest.java
@@ -501,7 +501,6 @@ public class MasterElectionTest extends FleetControllerTest {
     public void previously_published_state_is_taken_into_account_for_default_space_when_controller_bootstraps() throws Exception {
         startingTest("MasterElectionTest::previously_published_state_is_taken_into_account_for_default_space_when_controller_bootstraps");
         FleetControllerOptions options = new FleetControllerOptions("mycluster");
-        options.enableMultipleBucketSpaces = true;
         options.clusterHasGlobalDocumentTypes = true;
         options.masterZooKeeperCooldownPeriod = 1;
         options.minTimeBeforeFirstSystemStateBroadcast = 100000;
@@ -545,7 +544,6 @@ public class MasterElectionTest extends FleetControllerTest {
     public void default_space_nodes_not_marked_as_maintenance_when_cluster_has_no_global_document_types() throws Exception {
         startingTest("MasterElectionTest::default_space_nodes_not_marked_as_maintenance_when_cluster_has_no_global_document_types");
         FleetControllerOptions options = new FleetControllerOptions("mycluster");
-        options.enableMultipleBucketSpaces = true;
         options.clusterHasGlobalDocumentTypes = false;
         options.masterZooKeeperCooldownPeriod = 1;
         options.minTimeBeforeFirstSystemStateBroadcast = 100000;