summaryrefslogtreecommitdiffstats
path: root/orchestrator
diff options
context:
space:
mode:
authorJon Marius Venstad <venstad@gmail.com>2021-03-12 10:43:39 +0100
committerJon Marius Venstad <venstad@gmail.com>2021-03-12 10:43:39 +0100
commitaa7d0a9541ffe2a4a5005d7c5257e6f37d9157d9 (patch)
tree98ff549e0df5aa7206824a342580932dc97ac1d0 /orchestrator
parent0ea817a6c5490f7251f89c0e743d20270925c469 (diff)
Remove redundant logging (and log text generation)
Diffstat (limited to 'orchestrator')
-rw-r--r--orchestrator/src/main/java/com/yahoo/vespa/orchestrator/model/VespaModelUtil.java7
1 files changed, 1 insertions, 6 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 +