diff options
| author | Martin Polden <mpolden@mpolden.no> | 2018-04-13 15:15:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-13 15:15:52 +0200 |
| commit | bf0d23e4bc995732c5ab8c8a632759e44c0e5134 (patch) | |
| tree | c09f46ace955072fa3a4b89456fba88b51b50eb0 /node-repository | |
| parent | d7e74169131c9288cdec95e6019d3a90c668846e (diff) | |
| parent | 8628ac354933cbac834d1f74cffb807bb933d323 (diff) | |
Merge pull request #5578 from vespa-engine/mpolden/health-status-use-rotation-name
Use rotation FQDN when checking health status
Diffstat (limited to 'node-repository')
| -rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabaseClient.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabaseClient.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabaseClient.java index effa8f17d52..7fc305d397f 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabaseClient.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabaseClient.java @@ -4,7 +4,6 @@ package com.yahoo.vespa.hosted.provision.persistence; import com.google.common.util.concurrent.UncheckedTimeoutException; import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.ApplicationLockException; -import com.yahoo.config.provision.Environment; import com.yahoo.config.provision.NodeFlavors; import com.yahoo.config.provision.Zone; import com.yahoo.log.LogLevel; @@ -217,9 +216,9 @@ public class CuratorDatabaseClient { return node.status(); } - /** In automated test environments, nodes need to be reused quickly to achieve fast test turnaronud time */ + /** In automated test environments, nodes need to be reused quickly to achieve fast test turnaround time */ private boolean needsFastNodeReuse(Zone zone) { - return zone.environment() == Environment.staging || zone.environment() == Environment.test; + return zone.environment().isTest(); } /** |