diff options
| -rw-r--r-- | config-model/src/test/java/com/yahoo/vespa/model/content/ContentSearchClusterTest.java | 3 | ||||
| -rw-r--r-- | storage/src/vespa/storage/config/bucketspaces.def | 3 |
2 files changed, 6 insertions, 0 deletions
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 8489aefc57a..41bba055a50 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 @@ -17,6 +17,7 @@ import static com.yahoo.config.model.test.TestUtil.joinLines; import static com.yahoo.vespa.model.content.utils.ContentClusterUtils.createCluster; import static com.yahoo.vespa.model.content.utils.SearchDefinitionBuilder.createSearchDefinitions; import static junit.framework.TestCase.assertEquals; +import static junit.framework.TestCase.assertFalse; /** * Unit tests for content search cluster. @@ -133,6 +134,8 @@ 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()); } } diff --git a/storage/src/vespa/storage/config/bucketspaces.def b/storage/src/vespa/storage/config/bucketspaces.def index 3ed1abba0b4..4db107ec1ee 100644 --- a/storage/src/vespa/storage/config/bucketspaces.def +++ b/storage/src/vespa/storage/config/bucketspaces.def @@ -9,3 +9,6 @@ documenttype[].name string ## The bucket space this document type belongs to. documenttype[].bucketspace string + +## Switch to enable multiple bucket spaces in content layer and content nodes. +enable_multiple_bucket_spaces bool default=false |