diff options
| author | Jon Bratseth <bratseth@yahoo-inc.com> | 2017-11-21 13:55:44 +0100 |
|---|---|---|
| committer | Jon Bratseth <bratseth@yahoo-inc.com> | 2017-11-21 13:55:44 +0100 |
| commit | 45bd5c46ccb2e4387dda3b9c5315076ab4319c99 (patch) | |
| tree | 62a5a5ff47f3a2a797e409170fe34db8987a0b3f /config-model/src | |
| parent | 78c5a127ae16a1478ab86c690aa8123f49e3412b (diff) | |
Nonfunctional changes only
Diffstat (limited to 'config-model/src')
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/search/IndexedSearchCluster.java | 9 | ||||
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/search/NodeSpec.java | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedSearchCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedSearchCluster.java index 7e0cb57aaff..8d7d289b99f 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedSearchCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedSearchCluster.java @@ -192,14 +192,15 @@ public abstract class IndexedSearchCluster extends SearchCluster */ public void addTldsWithSameIdsAsContainers(AbstractConfigProducer tldParent, ContainerCluster containerCluster) { for (Container container : containerCluster.getContainers()) { - final String containerSubId = container.getSubId(); - if (!containerSubId.contains(".")) { + String containerSubId = container.getSubId(); + if ( ! containerSubId.contains(".")) { throw new RuntimeException("Expected container sub id to be of the form string.number"); } int containerIndex = Integer.parseInt(containerSubId.split("\\.")[1]); - final String containerClusterName = containerCluster.getName(); + String containerClusterName = containerCluster.getName(); log.log(LogLevel.DEBUG, "Adding tld with index " + containerIndex + " for content cluster " + this.getClusterName() + - ", container cluster " + containerClusterName + " (container id " + containerSubId + ") on host " + container.getHostResource().getHostName()); + ", container cluster " + containerClusterName + " (container id " + containerSubId + + ") on host " + container.getHostResource().getHostName()); rootDispatch.addDispatcher(createTld(tldParent, container.getHostResource(), containerClusterName, containerIndex)); } } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/NodeSpec.java b/config-model/src/main/java/com/yahoo/vespa/model/search/NodeSpec.java index ba3d187bf8d..a0ec1bb9d22 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/search/NodeSpec.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/search/NodeSpec.java @@ -2,7 +2,7 @@ package com.yahoo.vespa.model.search; /** - * Represents the row id and partition id of a search interface node. + * Represents the group and partition id of a search interface node. * * @author geirst */ |