diff options
author | Valerij Fredriksen <valerijf@verizonmedia.com> | 2019-01-29 11:20:50 +0100 |
---|---|---|
committer | Valerij Fredriksen <valerijf@verizonmedia.com> | 2019-01-29 11:20:50 +0100 |
commit | 41517d52cf381ab35e8593782821125542786da7 (patch) | |
tree | 2430be20f4afc84b00d6d42cb6d173e497f5cc62 | |
parent | 54fc5db221f4b1f0b4edf23fd574dc670740e2da (diff) |
ParentHostNotReadyException -> ParentHostUnavailableException
-rw-r--r-- | config-provisioning/abi-spec.json | 2 | ||||
-rw-r--r-- | config-provisioning/src/main/java/com/yahoo/config/provision/ParentHostUnavailableException.java (renamed from config-provisioning/src/main/java/com/yahoo/config/provision/ParentHostNotReadyException.java) | 4 | ||||
-rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/http/HttpHandler.java | 4 | ||||
-rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/Activator.java | 4 | ||||
-rw-r--r-- | node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DockerProvisioningTest.java | 4 |
5 files changed, 9 insertions, 9 deletions
diff --git a/config-provisioning/abi-spec.json b/config-provisioning/abi-spec.json index f5923160f3a..3e55f74d3b2 100644 --- a/config-provisioning/abi-spec.json +++ b/config-provisioning/abi-spec.json @@ -523,7 +523,7 @@ ], "fields": [] }, - "com.yahoo.config.provision.ParentHostNotReadyException": { + "com.yahoo.config.provision.ParentHostUnavailableException": { "superClass": "java.lang.RuntimeException", "interfaces": [], "attributes": [ diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/ParentHostNotReadyException.java b/config-provisioning/src/main/java/com/yahoo/config/provision/ParentHostUnavailableException.java index da276136b48..357897df898 100644 --- a/config-provisioning/src/main/java/com/yahoo/config/provision/ParentHostNotReadyException.java +++ b/config-provisioning/src/main/java/com/yahoo/config/provision/ParentHostUnavailableException.java @@ -9,9 +9,9 @@ package com.yahoo.config.provision; * @author freva * */ -public class ParentHostNotReadyException extends RuntimeException { +public class ParentHostUnavailableException extends RuntimeException { - public ParentHostNotReadyException(String message) { + public ParentHostUnavailableException(String message) { super(message); } diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/HttpHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/HttpHandler.java index 43ccf8e69e4..cd2052653ed 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/HttpHandler.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/HttpHandler.java @@ -2,7 +2,7 @@ package com.yahoo.vespa.config.server.http; import com.yahoo.config.provision.ApplicationLockException; -import com.yahoo.config.provision.ParentHostNotReadyException; +import com.yahoo.config.provision.ParentHostUnavailableException; import com.yahoo.container.jdisc.HttpRequest; import com.yahoo.container.jdisc.HttpResponse; import com.yahoo.container.jdisc.LoggingRequestHandler; @@ -62,7 +62,7 @@ public class HttpHandler extends LoggingRequestHandler { return HttpErrorResponse.requestTimeout(getMessage(e, request)); } catch (ApplicationLockException e) { return HttpErrorResponse.applicationLockFailure(getMessage(e, request)); - } catch (ParentHostNotReadyException e) { + } catch (ParentHostUnavailableException e) { return HttpErrorResponse.parentHostNotReady(getMessage(e, request)); } catch (Exception e) { log.log(LogLevel.WARNING, "Unexpected exception handling a config server request", e); diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/Activator.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/Activator.java index f560c269cff..f48f0c1bdce 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/Activator.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/Activator.java @@ -3,7 +3,7 @@ package com.yahoo.vespa.hosted.provision.provisioning; import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.HostSpec; -import com.yahoo.config.provision.ParentHostNotReadyException; +import com.yahoo.config.provision.ParentHostUnavailableException; import com.yahoo.transaction.Mutex; import com.yahoo.transaction.NestedTransaction; import com.yahoo.vespa.hosted.provision.Node; @@ -102,7 +102,7 @@ class Activator { child.hostname(), parent.hostname(), parent.state()))) .flatMap(Optional::stream) .collect(Collectors.joining(" ")); - throw new ParentHostNotReadyException("Activation of " + application + " failed: " + detailedError); + throw new ParentHostUnavailableException("Activation of " + application + " failed: " + detailedError); } } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DockerProvisioningTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DockerProvisioningTest.java index 10f61ff378b..85ecf9c5073 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DockerProvisioningTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DockerProvisioningTest.java @@ -10,7 +10,7 @@ import com.yahoo.config.provision.Environment; import com.yahoo.config.provision.HostSpec; import com.yahoo.config.provision.InstanceName; import com.yahoo.config.provision.NodeType; -import com.yahoo.config.provision.ParentHostNotReadyException; +import com.yahoo.config.provision.ParentHostUnavailableException; import com.yahoo.config.provision.RegionName; import com.yahoo.config.provision.Zone; import com.yahoo.vespa.hosted.provision.Node; @@ -87,7 +87,7 @@ public class DockerProvisioningTest { try { tester.activate(application1, new HashSet<>(nodes)); fail("Expected the allocation to fail due to parent hosts not being active yet"); - } catch (ParentHostNotReadyException ignored) { } + } catch (ParentHostUnavailableException ignored) { } // Activate the zone-app, thereby allocating the parents List<HostSpec> hosts = tester.prepare(zoneApplication, |