diff options
author | Valerij Fredriksen <valerij92@gmail.com> | 2019-06-07 18:54:26 +0200 |
---|---|---|
committer | Valerij Fredriksen <valerij92@gmail.com> | 2019-06-07 20:16:36 +0200 |
commit | 10fb0f23409a8e0af4cc6354e70d89a91acb4099 (patch) | |
tree | deacaf08a429be65bcb5ea68a5dec8fd0f4dfeb4 | |
parent | 391662c6b11628c21e152c3a0cc24da98ab608ed (diff) |
Remove early expiry for tenant hosts from inactive
-rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/InactiveExpirer.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/InactiveExpirer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/InactiveExpirer.java index 9efde8cf673..013fd169f45 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/InactiveExpirer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/InactiveExpirer.java @@ -1,7 +1,6 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.hosted.provision.maintenance; -import com.yahoo.config.provision.NodeType; import com.yahoo.vespa.hosted.provision.Node; import com.yahoo.vespa.hosted.provision.NodeRepository; import com.yahoo.vespa.hosted.provision.node.Agent; @@ -51,8 +50,7 @@ public class InactiveExpirer extends Expirer { @Override protected boolean isExpired(Node node) { return super.isExpired(node) - || node.allocation().get().owner().instance().isTester() - || node.type() == NodeType.host; // TODO: Remove after removing tenant hosts from zone-app + || node.allocation().get().owner().instance().isTester(); } } |