diff options
| author | Jon Bratseth <bratseth@yahoo-inc.com> | 2016-10-17 09:49:44 +0200 |
|---|---|---|
| committer | Jon Bratseth <bratseth@yahoo-inc.com> | 2016-10-17 09:49:44 +0200 |
| commit | 71912fde628b6f9a2cb066933f2cae3c29a96ebf (patch) | |
| tree | 72ba000f2af3c2c803bbb30a45224f5bf2f04b4b /configserver | |
| parent | d3128af7e81b9c92e07176520e85ecec4158a71c (diff) | |
Nonfunctional changes
Diffstat (limited to 'configserver')
| -rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/host/HostRegistry.java | 6 | ||||
| -rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/provision/StaticProvisioner.java | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/host/HostRegistry.java b/configserver/src/main/java/com/yahoo/vespa/config/server/host/HostRegistry.java index dfa72b03126..ccf4b2190d7 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/host/HostRegistry.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/host/HostRegistry.java @@ -31,7 +31,8 @@ public class HostRegistry<T> implements HostValidator<T> { public void update(T key, Collection<String> newHosts) { verifyHosts(key, newHosts); - log.log(LogLevel.DEBUG, "Setting hosts for key(" + key + "), newHosts(" + newHosts + "), currentHosts(" + getCurrentHosts(key) + ")"); + log.log(LogLevel.DEBUG, "Setting hosts for key(" + key + "), newHosts(" + newHosts + "), " + + "currentHosts(" + getCurrentHosts(key) + ")"); Collection<String> removedHosts = getRemovedHosts(newHosts, getCurrentHosts(key)); removeHosts(removedHosts); addHosts(key, newHosts); @@ -40,7 +41,8 @@ public class HostRegistry<T> implements HostValidator<T> { public void verifyHosts(T key, Collection<String> newHosts) { for (String host : newHosts) { if (hostAlreadyTaken(host, key)) { - throw new IllegalArgumentException("'" + key + "' tried to allocate host '" + host + "', but the host is already taken by '" + host2KeyMap.get(host) + "'"); + throw new IllegalArgumentException("'" + key + "' tried to allocate host '" + host + + "', but the host is already taken by '" + host2KeyMap.get(host) + "'"); } } } diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/provision/StaticProvisioner.java b/configserver/src/main/java/com/yahoo/vespa/config/server/provision/StaticProvisioner.java index 85fe56fb15a..ec681bf0a70 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/provision/StaticProvisioner.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/provision/StaticProvisioner.java @@ -22,7 +22,7 @@ public class StaticProvisioner implements HostProvisioner { @Override public HostSpec allocateHost(String alias) { - throw new UnsupportedOperationException(); + throw new UnsupportedOperationException("Allocating a single host from provisioning info is not supported"); } @Override |