diff options
| -rw-r--r-- | orchestrator/src/main/java/com/yahoo/vespa/orchestrator/model/VespaModelUtil.java | 7 | ||||
| -rw-r--r-- | zkfacade/src/main/java/com/yahoo/vespa/curator/CuratorCompletionWaiter.java | 6 |
2 files changed, 5 insertions, 8 deletions
diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/model/VespaModelUtil.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/model/VespaModelUtil.java index 18d8a3c42cb..9274fd48cb9 100644 --- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/model/VespaModelUtil.java +++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/model/VespaModelUtil.java @@ -80,16 +80,11 @@ public class VespaModelUtil { Collection<ServiceCluster> controllerClustersForContentCluster = filter(controllerClusters, contentClusterId); - // TODO jonmv: the exception will be the new norm here. Set<ServiceInstance> clusterControllerInstances; if (controllerClustersForContentCluster.size() == 1) { clusterControllerInstances = first(controllerClustersForContentCluster).serviceInstances(); } else if (controllerClusters.size() == 1) { - ServiceCluster cluster = first(controllerClusters); - log.info("No cluster controller cluster for content cluster " + contentClusterId - + ", using the only cluster controller cluster available: " + cluster.clusterId()); - - clusterControllerInstances = cluster.serviceInstances(); + clusterControllerInstances = first(controllerClusters).serviceInstances(); } else { throw new RuntimeException("Failed getting cluster controller for content cluster " + contentClusterId + ". Available clusters = " + controllerClusters + diff --git a/zkfacade/src/main/java/com/yahoo/vespa/curator/CuratorCompletionWaiter.java b/zkfacade/src/main/java/com/yahoo/vespa/curator/CuratorCompletionWaiter.java index 0f8c524fa98..3789e30509c 100644 --- a/zkfacade/src/main/java/com/yahoo/vespa/curator/CuratorCompletionWaiter.java +++ b/zkfacade/src/main/java/com/yahoo/vespa/curator/CuratorCompletionWaiter.java @@ -57,8 +57,10 @@ class CuratorCompletionWaiter implements Curator.CompletionWaiter { List<String> respondents; do { respondents = curator.framework().getChildren().forPath(barrierPath); - log.log(Level.FINE, respondents.size() + "/" + curator.zooKeeperEnsembleCount() + " responded: " + - respondents + ", all participants: " + curator.zooKeeperEnsembleConnectionSpec()); + if (log.isLoggable(Level.FINE)) { + log.log(Level.FINE, respondents.size() + "/" + curator.zooKeeperEnsembleCount() + " responded: " + + respondents + ", all participants: " + curator.zooKeeperEnsembleConnectionSpec()); + } // First, check if all config servers responded if (respondents.size() == curator.zooKeeperEnsembleCount()) { |