summaryrefslogtreecommitdiffstats
path: root/node-repository/src
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@gmail.com>2020-07-02 11:54:43 +0200
committerJon Bratseth <bratseth@gmail.com>2020-07-02 11:54:43 +0200
commiteb37f7dcbd89143715fbe9b838a91b296db0a3c9 (patch)
treea065cc8ffe0bee8fc9022fd32a926ff5712542c6 /node-repository/src
parentb4abecef92c802ee6f779dc77d4328cc6fbf22cb (diff)
Improvements to handling of cluster removal
- Don't change health status to "initializing" when creating a new VipStatus, as 'initializing' now requires all clusters to be up to transition to 'up', which means that if we're already up but are missing a cluster we'll go from 'up' to 'initializing' and stay there. - Forget up/down status for removed clusters. - Nicer logging on ignorable reconfiguration errors.
Diffstat (limited to 'node-repository/src')
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeAllocation.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeAllocation.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeAllocation.java
index df8a7e45917..e8639561599 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeAllocation.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeAllocation.java
@@ -260,7 +260,6 @@ class NodeAllocation {
node = node.unretire();
} else {
++wasRetiredJustNow;
- // Retire nodes which are of an unwanted flavor, retired flavor or have an overlapping parent host
node = node.retire(nodeRepository.clock().instant());
}
if ( ! node.allocation().get().membership().cluster().equals(cluster)) {