diff options
| author | Harald Musum <musum@oath.com> | 2018-01-24 11:20:50 +0100 |
|---|---|---|
| committer | Harald Musum <musum@oath.com> | 2018-01-24 11:20:50 +0100 |
| commit | 1aafb345c823f8c5b3bca8fc276222579e595822 (patch) | |
| tree | a550bcebe8158b8dd6436ad84eaf8ebed76c74ca /node-repository | |
| parent | 00a573bb981a6dfd29ec5d4a42f0e411bf835be5 (diff) | |
Expire content nodes in cd after one hour
Diffstat (limited to 'node-repository')
2 files changed, 3 insertions, 2 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirer.java index 031d56e3164..4ee56167c50 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirer.java @@ -5,6 +5,7 @@ import com.yahoo.config.provision.ClusterSpec; import com.yahoo.config.provision.Environment; import com.yahoo.config.provision.Flavor; import com.yahoo.config.provision.NodeType; +import com.yahoo.config.provision.SystemName; import com.yahoo.config.provision.Zone; import com.yahoo.vespa.hosted.provision.Node; import com.yahoo.vespa.hosted.provision.NodeRepository; @@ -72,7 +73,7 @@ public class FailedExpirer extends Maintainer { .filter(node -> node.allocation().isPresent() && node.allocation().get().membership().cluster().type() == ClusterSpec.Type.container) .collect(Collectors.toList()); - List<Node> remainingNodes = getExpiredNodes(defaultExpiry); + List<Node> remainingNodes = getExpiredNodes(zone.system() == SystemName.cd ? containerExpiry : defaultExpiry); remainingNodes.removeAll(containerNodes); recycle(containerNodes); recycle(remainingNodes); diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirerTest.java index 720c5b05443..7354d3e8e8e 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirerTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirerTest.java @@ -147,7 +147,7 @@ public class FailedExpirerTest { @Test public void ensure_failed_docker_host_is_not_parked_unless_all_children_are() { - FailureScenario scenario = new FailureScenario(SystemName.cd, Environment.prod) + FailureScenario scenario = new FailureScenario(SystemName.main, Environment.prod) .withNode(NodeType.host, FailureScenario.defaultFlavor, "parent1") .withNode(NodeType.host, FailureScenario.defaultFlavor, "parent2") .withNode(NodeType.host, FailureScenario.defaultFlavor, "parent3") |