aboutsummaryrefslogtreecommitdiffstats
path: root/node-repository/src
diff options
context:
space:
mode:
authorjonmv <venstad@gmail.com>2023-07-06 17:48:08 +0200
committerjonmv <venstad@gmail.com>2023-07-06 17:48:08 +0200
commitd591d2d7d4571f97f30f5240c26f363717cbe0c4 (patch)
treee2388ed8d5351f9edee38bfe24b1db70837b31a6 /node-repository/src
parent49b755a8636f0f5a7c1ff3518f91bc1b278efc09 (diff)
Actually update extra id
Diffstat (limited to 'node-repository/src')
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/Node.java4
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/HostResumeProvisioner.java4
2 files changed, 5 insertions, 3 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/Node.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/Node.java
index 48a1f0a72f0..864566f119e 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/Node.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/Node.java
@@ -483,8 +483,8 @@ public final class Node implements Nodelike {
exclusiveToClusterType, switchHostname, trustStoreItems, cloudAccount, wireguardPubKey);
}
- public Node withExtraId(String extraId) {
- return new Node(id, Optional.of(extraId), ipConfig, hostname, parentHostname, flavor, status, state, allocation, history,
+ public Node withExtraId(Optional<String> extraId) {
+ return new Node(id, extraId, ipConfig, hostname, parentHostname, flavor, status, state, allocation, history,
type, reports, modelName, reservedTo, exclusiveToApplicationId, hostTTL, hostEmptyAt,
exclusiveToClusterType, switchHostname, trustStoreItems, cloudAccount, wireguardPubKey);
}
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/HostResumeProvisioner.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/HostResumeProvisioner.java
index 9279592f4cc..f78d717e010 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/HostResumeProvisioner.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/HostResumeProvisioner.java
@@ -87,7 +87,9 @@ public class HostResumeProvisioner extends NodeRepositoryMaintainer {
updated.add(nodeRepository().nodes().write(mutex.node().with(hostIpConfig.require(mutex.node().hostname())), mutex));
updated.add(nodeRepository().nodes().write(nodes.parent().node()
- .with(hostIpConfig.require(nodes.parent().node().hostname())), nodes.parent()));
+ .with(hostIpConfig.require(nodes.parent().node().hostname()))
+ .withExtraId(hostIpConfig.hostId()),
+ nodes.parent()));
return updated;
});