summaryrefslogtreecommitdiffstats
path: root/configserver
diff options
context:
space:
mode:
authorHarald Musum <musum@oath.com>2017-12-19 09:32:46 +0100
committerHarald Musum <musum@oath.com>2017-12-19 09:32:46 +0100
commita2c243875e74bf668c9103329e3dc8239c9a61d8 (patch)
tree5c8388cbdcbd65d69bbcab4e320e3a63670dfc1d /configserver
parent067eb48b7d2fc062a74392b1c16f5538b5031d5b (diff)
Skip checking config convergence for clustercontroller
Diffstat (limited to 'configserver')
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationConvergenceChecker.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationConvergenceChecker.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationConvergenceChecker.java
index 39cd4629ff0..6eb942963c0 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationConvergenceChecker.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationConvergenceChecker.java
@@ -35,7 +35,8 @@ public class ApplicationConvergenceChecker extends AbstractComponent {
private final static Set<String> serviceTypesToCheck = new HashSet<>(Arrays.asList(
"container",
- "container-clustercontroller",
+ // TODO: Skip temporarily to avoid issues with clustercontrollers moving around. Add back when 6.188 is latest version in use
+ //"container-clustercontroller",
"qrserver",
"docprocservice",
"searchnode",