summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Marius Venstad <jonmv@users.noreply.github.com>2023-06-02 11:44:10 +0200
committerGitHub <noreply@github.com>2023-06-02 11:44:10 +0200
commitd406dbfb44a33b4b4d0c3befaaa44c14af0b4f24 (patch)
tree8f1ff3263e5cf0e1756bd97a5a808247285c6e59
parent934ebe39383acdab116ba5c98009321b83b0b545 (diff)
Revert "Remove unused agent"
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/ExpeditedChangeApplicationMaintainer.java2
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Agent.java1
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java2
3 files changed, 4 insertions, 1 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/ExpeditedChangeApplicationMaintainer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/ExpeditedChangeApplicationMaintainer.java
index f4c43e8fe6e..ffa125230a8 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/ExpeditedChangeApplicationMaintainer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/ExpeditedChangeApplicationMaintainer.java
@@ -103,7 +103,7 @@ public class ExpeditedChangeApplicationMaintainer extends ApplicationMaintainer
/** Returns whether to expedite changes performed by agent */
private boolean expediteChangeBy(Agent agent) {
return switch (agent) {
- case operator, HostResumeProvisioner, RebuildingOsUpgrader -> true;
+ case operator, HostEncrypter, HostResumeProvisioner, RebuildingOsUpgrader -> true;
default -> false;
};
}
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Agent.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Agent.java
index f970618f973..0b2bdb4620a 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Agent.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Agent.java
@@ -28,5 +28,6 @@ public enum Agent {
RebuildingOsUpgrader,
SpareCapacityMaintainer,
SwitchRebalancer,
+ HostEncrypter,
}
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java
index f6d1777d0cd..b176d0ce765 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java
@@ -486,6 +486,7 @@ public class NodeSerializer {
case "RebuildingOsUpgrader" -> Agent.RebuildingOsUpgrader;
case "SpareCapacityMaintainer" -> Agent.SpareCapacityMaintainer;
case "SwitchRebalancer" -> Agent.SwitchRebalancer;
+ case "HostEncrypter" -> Agent.HostEncrypter;
case "ParkedExpirer" -> Agent.ParkedExpirer;
default -> throw new IllegalArgumentException("Unknown node event agent '" + eventAgentField.asString() + "'");
};
@@ -509,6 +510,7 @@ public class NodeSerializer {
case RebuildingOsUpgrader -> "RebuildingOsUpgrader";
case SpareCapacityMaintainer -> "SpareCapacityMaintainer";
case SwitchRebalancer -> "SwitchRebalancer";
+ case HostEncrypter -> "HostEncrypter";
case ParkedExpirer -> "ParkedExpirer";
};
}