Merge pull request #4764 from vespa-engine/hmusum/use-smaller-expiry-time-in-cd

Expire content nodes in cd after one hour

2 files changed, 4 insertions, 3 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..c3c32f2decb 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
@@ -96,7 +96,7 @@ public class FailedExpirerTest {
                 .failNode(4, "node1")
                 .failWithHardwareFailure("node2", "node3");
 
-        scenario.clock().advance(Duration.ofDays(5));
+        scenario.clock().advance(Duration.ofHours(2));
         scenario.expirer().run();
 
         scenario.assertNodesIn(Node.State.failed, "node1");
@@ -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")