summaryrefslogtreecommitdiffstats
path: root/node-repository
diff options
context:
space:
mode:
authorMartin Polden <mpolden@mpolden.no>2022-04-22 10:30:18 +0200
committerMartin Polden <mpolden@mpolden.no>2022-04-22 10:30:18 +0200
commit2a91effedc566c8a491af926fbe2451dc9f40629 (patch)
tree667ec51e92d295c486b5db4e559c484533153266 /node-repository
parent8eb766fa049f5261e450863f532f5cd53072bd26 (diff)
Rename agent: RetiringUpgrader -> RetiringOsUpgrader
Diffstat (limited to 'node-repository')
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Agent.java2
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/os/RetiringOsUpgrader.java2
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java4
3 files changed, 4 insertions, 4 deletions
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 2c5a3b924d8..b61893620d4 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
@@ -23,7 +23,7 @@ public enum Agent {
ReservationExpirer,
ParkedExpirer,
DynamicProvisioningMaintainer,
- RetiringUpgrader,
+ RetiringOsUpgrader,
RebuildingOsUpgrader,
SpareCapacityMaintainer,
SwitchRebalancer,
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/os/RetiringOsUpgrader.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/os/RetiringOsUpgrader.java
index ba59ff8e425..d923c78a929 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/os/RetiringOsUpgrader.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/os/RetiringOsUpgrader.java
@@ -65,7 +65,7 @@ public class RetiringOsUpgrader implements OsUpgrader {
LOG.info("Retiring and deprovisioning " + host + ": On stale OS version " +
host.status().osVersion().current().map(Version::toFullString).orElse("<unset>") +
", want " + target);
- nodeRepository.nodes().deprovision(host.hostname(), Agent.RetiringUpgrader, now);
+ nodeRepository.nodes().deprovision(host.hostname(), Agent.RetiringOsUpgrader, now);
nodeRepository.nodes().upgradeOs(NodeListFilter.from(host), Optional.of(target));
nodeRepository.osVersions().writeChange((change) -> change.withRetirementAt(now, host.type()));
}
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 7eea56c7c4e..7bbf5efba92 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
@@ -522,7 +522,7 @@ public class NodeSerializer {
case "ProvisionedExpirer" : return Agent.ProvisionedExpirer;
case "Rebalancer" : return Agent.Rebalancer;
case "ReservationExpirer" : return Agent.ReservationExpirer;
- case "RetiringUpgrader" : return Agent.RetiringUpgrader;
+ case "RetiringUpgrader" : return Agent.RetiringOsUpgrader;
case "RebuildingOsUpgrader" : return Agent.RebuildingOsUpgrader;
case "SpareCapacityMaintainer": return Agent.SpareCapacityMaintainer;
case "SwitchRebalancer": return Agent.SwitchRebalancer;
@@ -545,7 +545,7 @@ public class NodeSerializer {
case ProvisionedExpirer : return "ProvisionedExpirer";
case Rebalancer : return "Rebalancer";
case ReservationExpirer : return "ReservationExpirer";
- case RetiringUpgrader: return "RetiringUpgrader";
+ case RetiringOsUpgrader: return "RetiringUpgrader";
case RebuildingOsUpgrader: return "RebuildingOsUpgrader";
case SpareCapacityMaintainer: return "SpareCapacityMaintainer";
case SwitchRebalancer: return "SwitchRebalancer";