diff options
| author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2021-03-12 10:50:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-12 10:50:01 +0100 |
| commit | a3dbf3ecbf6dc04ad4550d5e26edba446ac6f920 (patch) | |
| tree | 2110aeadcdfb666aa0f8ba0af74661afbe69b24c | |
| parent | 37d68e79fec3070078d431616f215dfb62099586 (diff) | |
| parent | aa7d0a9541ffe2a4a5005d7c5257e6f37d9157d9 (diff) | |
Merge pull request #16917 from vespa-engine/jonmv/remove-redundant-logging
Remove redundant logging (and log text generation)
| -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()) { |