Remove experimental enable-multiple-bucket-spaces flag.

The feature has been default on since late May 2018.

4 files changed, 13 insertions, 69 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java
index 7bb6e3dabd4..27da41c2bfa 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java
@@ -86,7 +86,6 @@ public class ContentCluster extends AbstractConfigProducer implements
     private final boolean isHostedVespa;
     private final Map<String, NewDocumentType> documentDefinitions;
     private final Set<NewDocumentType> globallyDistributedDocuments;
-    private boolean forceEnableMultipleBucketSpaces = false;
     private com.yahoo.vespa.model.content.StorageGroup rootGroup;
     private StorageCluster storageNodes;
     private DistributorCluster distributorNodes;
@@ -266,10 +265,7 @@ public class ContentCluster extends AbstractConfigProducer implements
         }
 
         private void setupExperimental(ContentCluster cluster, ModelElement experimental) {
-            Boolean enableMultipleBucketSpaces = experimental.childAsBoolean("enable-multiple-bucket-spaces");
-            if (enableMultipleBucketSpaces != null) {
-                cluster.forceEnableMultipleBucketSpaces = enableMultipleBucketSpaces;
-            }
+            // Put handling of experimental flags here
         }
 
         private void validateGroupSiblings(String cluster, StorageGroup group) {
@@ -615,7 +611,6 @@ public class ContentCluster extends AbstractConfigProducer implements
             builder.min_distributor_up_ratio(0);
             builder.min_storage_up_ratio(0);
         }
-        builder.enable_multiple_bucket_spaces(true);
         // Telling the controller whether we actually _have_ global document types lets
         // it selectively enable or disable constraints that aren't needed when these
         // are not are present, even if full protocol and backend support is enabled
@@ -750,9 +745,5 @@ public class ContentCluster extends AbstractConfigProducer implements
             docTypeBuilder.bucketspace(bucketSpace);
             builder.documenttype(docTypeBuilder);
         }
-        // NOTE: this config is kept around to allow the use of multiple bucket spaces
-        // on older versions of Vespa. It is for all intents and purposes a no-op in
-        // newer versions where multiple bucket spaces are enabled by default.
-        builder.enable_multiple_bucket_spaces(forceEnableMultipleBucketSpaces);
     }
 }
diff --git a/config-model/src/main/resources/schema/content.rnc b/config-model/src/main/resources/schema/content.rnc
index 58d22ea9b6f..c0313cd50ef 100644
--- a/config-model/src/main/resources/schema/content.rnc
+++ b/config-model/src/main/resources/schema/content.rnc
@@ -114,9 +114,9 @@ Content = element content {
     Documents? &
     ContentNodes? &
     TopGroup? &
-    Controllers? &
+    Controllers?
     # Contains experimental feature switches
-    Experimental?
+    #Experimental?
 }
 
 Controllers =
@@ -368,9 +368,9 @@ TuningCompression = element compression {
    element level { xsd:nonNegativeInteger }?
 }
 
-Experimental = element experimental {
-    element enable-multiple-bucket-spaces { xsd:boolean }?
-}
+#Experimental = element experimental {
+# Put experimental flags here
+#}
 
 Thread = element thread {
   ## The lowest priority this thread should handle.
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/ContentSearchClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/ContentSearchClusterTest.java
index 0156128f7ca..83b4cfebca5 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/ContentSearchClusterTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/ContentSearchClusterTest.java
@@ -40,8 +40,11 @@ public class ContentSearchClusterTest {
     }
 
     private static ContentCluster createClusterWithGlobalType() throws Exception {
-        return createCluster(createClusterBuilderWithGlobalType().getXml(),
-                createSearchDefinitions("global", "regular"));
+        return createClusterFromBuilderAndDocTypes(createClusterBuilderWithGlobalType(), "global", "regular");
+    }
+
+    private static ContentCluster createClusterWithoutGlobalType() throws Exception {
+        return createClusterFromBuilderAndDocTypes(createClusterBuilderWithOnlyDefaultTypes(), "marve", "fleksnes");
     }
 
     private static ContentCluster createClusterFromBuilderAndDocTypes(ContentClusterBuilder builder, String... docTypes) throws Exception {
@@ -49,26 +52,10 @@ public class ContentSearchClusterTest {
                 "<node distribution-key='0' hostalias='mockhost'/>",
                 "<node distribution-key='1' hostalias='mockhost'/>",
                 "</group>"));
-        builder.enableMultipleBucketSpaces(true);
         String clusterXml = builder.getXml();
         return createCluster(clusterXml, createSearchDefinitions(docTypes));
     }
 
-    private static ContentCluster createClusterWithMultipleBucketSpacesEnabled() throws Exception {
-        return createClusterFromBuilderAndDocTypes(createClusterBuilderWithGlobalType(), "global", "regular");
-    }
-
-    private static ContentCluster createClusterWithMultipleBucketSpacesEnabledButNoGlobalDocs() throws Exception {
-        return createClusterFromBuilderAndDocTypes(createClusterBuilderWithOnlyDefaultTypes(), "marve", "fleksnes");
-    }
-
-    private static ContentCluster createClusterWithGlobalDocsButNotMultipleSpacesEnabled() throws Exception {
-        return createCluster(createClusterBuilderWithGlobalType()
-                        .enableMultipleBucketSpaces(false)
-                        .getXml(),
-                createSearchDefinitions("global", "regular"));
-    }
-
     private static ContentClusterBuilder createClusterBuilderWithGlobalType() {
         return new ContentClusterBuilder()
                 .docTypes(Arrays.asList(DocType.indexGlobal("global"), DocType.index("regular")));
@@ -178,41 +165,18 @@ public class ContentSearchClusterTest {
         assertEquals(2, config.documenttype().size());
         assertDocumentType("global", "global", config.documenttype(0));
         assertDocumentType("regular", "default", config.documenttype(1));
-        // Safeguard against flipping the switch
-        assertFalse(config.enable_multiple_bucket_spaces());
-    }
-
-    @Test
-    public void require_that_multiple_bucket_spaces_can_be_force_enabled() throws Exception {
-        ContentCluster cluster = createClusterWithMultipleBucketSpacesEnabled();
-        {
-            BucketspacesConfig config = getBucketspacesConfig(cluster);
-            assertEquals(2, config.documenttype().size());
-            assertDocumentType("global", "global", config.documenttype(0));
-            assertDocumentType("regular", "default", config.documenttype(1));
-            assertTrue(config.enable_multiple_bucket_spaces());
-        }
-        {
-            assertTrue(getFleetcontrollerConfig(cluster).enable_multiple_bucket_spaces());
-        }
     }
 
     @Test
     public void cluster_with_global_document_types_sets_cluster_controller_global_docs_config_option() throws Exception {
-        ContentCluster cluster = createClusterWithMultipleBucketSpacesEnabled();
+        ContentCluster cluster = createClusterWithGlobalType();
         assertTrue(getFleetcontrollerConfig(cluster).cluster_has_global_document_types());
     }
 
     @Test
     public void cluster_without_global_document_types_unsets_cluster_controller_global_docs_config_option() throws Exception {
-        ContentCluster cluster = createClusterWithMultipleBucketSpacesEnabledButNoGlobalDocs();
+        ContentCluster cluster = createClusterWithoutGlobalType();
         assertFalse(getFleetcontrollerConfig(cluster).cluster_has_global_document_types());
     }
 
-    @Test
-    public void controller_global_documents_config_always_enabled_even_without_experimental_flag_set() throws Exception {
-        ContentCluster cluster = createClusterWithGlobalDocsButNotMultipleSpacesEnabled();
-        assertTrue(getFleetcontrollerConfig(cluster).cluster_has_global_document_types());
-    }
-
 }
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/utils/ContentClusterBuilder.java b/config-model/src/test/java/com/yahoo/vespa/model/content/utils/ContentClusterBuilder.java
index 79bc9504659..95c57bb544c 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/utils/ContentClusterBuilder.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/utils/ContentClusterBuilder.java
@@ -26,7 +26,6 @@ public class ContentClusterBuilder {
     private Optional<String> dispatchXml = Optional.empty();
     private Optional<Double> protonDiskLimit = Optional.empty();
     private Optional<Double> protonMemoryLimit = Optional.empty();
-    private Optional<Boolean> enableMultipleBucketSpaces = Optional.empty();
 
     public ContentClusterBuilder() {
     }
@@ -78,11 +77,6 @@ public class ContentClusterBuilder {
         return this;
     }
 
-    public ContentClusterBuilder enableMultipleBucketSpaces(boolean value) {
-        this.enableMultipleBucketSpaces = Optional.of(value);
-        return this;
-    }
-
     public ContentCluster build(MockRoot root) throws Exception {
         return ContentClusterUtils.createCluster(getXml(), root);
     }
@@ -100,11 +94,6 @@ public class ContentClusterBuilder {
         if (dispatchXml.isPresent()) {
             xml += dispatchXml.get();
         }
-        if (enableMultipleBucketSpaces.isPresent()) {
-            xml += joinLines("<experimental>",
-                    "<enable-multiple-bucket-spaces>" + (enableMultipleBucketSpaces.get() ? "true" : "false") + "</enable-multiple-bucket-spaces>",
-                    "</experimental>");
-        }
         return xml + groupXml +
                "</content>";
     }