summaryrefslogtreecommitdiffstats
path: root/configdefinitions
diff options
context:
space:
mode:
authorTor Brede Vekterli <vekterli@oath.com>2018-12-05 16:00:30 +0100
committerTor Brede Vekterli <vekterli@oath.com>2018-12-07 14:05:45 +0100
commit781588b2ec4746fec312c085ff01e913f5b70368 (patch)
tree261ae3a49dca3cf4e56f4c8fc907c64a01b19081 /configdefinitions
parent3de06a4a7b93c2e8fd34f8ed2af84adb15ba28a0 (diff)
Add and use cross-cluster bucket space config
Adds a new config `AllClustersBucketSpacesConfig` which includes all document type to bucket space mappings across all configured content clusters. Inject this config into `RestApi` to ensure all changes to the mapping is observed. This also removes the remaining per-request config fetching during Document V1 visit ops.
Diffstat (limited to 'configdefinitions')
-rw-r--r--configdefinitions/src/vespa/CMakeLists.txt2
-rw-r--r--configdefinitions/src/vespa/all-clusters-bucket-spaces.def9
2 files changed, 11 insertions, 0 deletions
diff --git a/configdefinitions/src/vespa/CMakeLists.txt b/configdefinitions/src/vespa/CMakeLists.txt
index 0a7d4ef4381..120c403eb74 100644
--- a/configdefinitions/src/vespa/CMakeLists.txt
+++ b/configdefinitions/src/vespa/CMakeLists.txt
@@ -72,5 +72,7 @@ vespa_generate_config(configdefinitions zookeepers.def)
install_config_definition(zookeepers.def cloud.config.zookeepers.def)
vespa_generate_config(configdefinitions bucketspaces.def)
install_config_definition(bucketspaces.def vespa.config.content.core.bucketspaces.def)
+vespa_generate_config(configdefinitions all-clusters-bucket-spaces.def)
+install_config_definition(all-clusters-bucket-spaces.def vespa.config.content.all-clusters-bucket-spaces.def)
vespa_generate_config(configdefinitions stateserver.def)
install_config_definition(stateserver.def vespa.config.core.stateserver.def)
diff --git a/configdefinitions/src/vespa/all-clusters-bucket-spaces.def b/configdefinitions/src/vespa/all-clusters-bucket-spaces.def
new file mode 100644
index 00000000000..7676bc2a03f
--- /dev/null
+++ b/configdefinitions/src/vespa/all-clusters-bucket-spaces.def
@@ -0,0 +1,9 @@
+# Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+namespace=vespa.config.content
+
+## This config contains the document types handled by all content clusters
+## and the bucket spaces they belong to.
+
+## The bucket space a document type in a particular cluster belongs to.
+cluster{}.documentType{}.bucketSpace string
+