Correctly configure reindexing for shared cluster controller cluster

Moved ReindexingContext to ClusterControllerContainerCluster.
Add document types to reindexing context during construction of ContentCluster instance.
Add disabled implementation of Reindexing to its Java interface.

1 files changed, 9 insertions, 1 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainerCluster.java
index ed4c50999fe..c202d29cc5d 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainerCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainerCluster.java
@@ -1,6 +1,7 @@
 // Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.model.admin.clustercontroller;
 
+import com.yahoo.config.model.api.Reindexing;
 import com.yahoo.config.model.deploy.DeployState;
 import com.yahoo.config.model.producer.AbstractConfigProducer;
 import com.yahoo.vespa.model.container.ContainerCluster;
@@ -12,9 +13,14 @@ import com.yahoo.vespa.model.container.ContainerCluster;
  */
 public class ClusterControllerContainerCluster extends ContainerCluster<ClusterControllerContainer>
 {
-    public ClusterControllerContainerCluster(AbstractConfigProducer<?> parent, String subId, String name, DeployState deployState) {
+
+    private final ReindexingContext reindexingContext;
+
+    public ClusterControllerContainerCluster(
+            AbstractConfigProducer<?> parent, String subId, String name, DeployState deployState) {
         super(parent, subId, name, deployState, false);
         addDefaultHandlersWithVip();
+        this.reindexingContext = new ReindexingContext(deployState.reindexing().orElse(Reindexing.DISABLED_INSTANCE));
     }
 
     @Override
@@ -22,4 +28,6 @@ public class ClusterControllerContainerCluster extends ContainerCluster<ClusterC
 
     @Override protected boolean messageBusEnabled() { return false; }
 
+    public ReindexingContext reindexingContext() { return reindexingContext; }
+
 }