diff options
| author | Martin Polden <mpolden@mpolden.no> | 2023-05-15 17:04:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-15 17:04:03 +0200 |
| commit | bf1d1349716ef16ccd114d861b1b95cf0c75f21e (patch) | |
| tree | d9457546b9308bd1e41212dc19e32b98f50c74ba /node-repository/src | |
| parent | a98b18cd45e8fae74a9e71c331698b7ed149ae98 (diff) | |
| parent | 4c22bb5100d2d5c4d3b6cf01d98d66dd75c4d1b1 (diff) | |
Merge pull request #27115 from vespa-engine/hmusum/replaceable-root-disk-for-non-x86_64
Support replacing root disk for arm64 again
Diffstat (limited to 'node-repository/src')
| -rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeList.java | 5 | ||||
| -rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/os/RebuildingOsUpgrader.java | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeList.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeList.java index 1cf7bcfa4f2..d1b900b9969 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeList.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeList.java @@ -86,10 +86,7 @@ public class NodeList extends AbstractFilteringList<Node, NodeList> { /** Returns the subset of nodes which have a replaceable root disk */ public NodeList replaceableRootDisk() { - // TODO(mpolden): Support any architecture if we change how cloud images for other - // architectures are managed - return matching(node -> node.resources().storageType() == NodeResources.StorageType.remote && - node.resources().architecture() == NodeResources.Architecture.x86_64); + return matching(node -> node.resources().storageType() == NodeResources.StorageType.remote); } /** Returns the subset of nodes which satisfy the given resources */ diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/os/RebuildingOsUpgrader.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/os/RebuildingOsUpgrader.java index 212bf5ffb12..e0affaae666 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/os/RebuildingOsUpgrader.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/os/RebuildingOsUpgrader.java @@ -55,7 +55,7 @@ public class RebuildingOsUpgrader extends OsUpgrader { private List<Node> rebuildableHosts(OsVersionTarget target, NodeList allNodes, Instant now) { NodeList hostsOfTargetType = allNodes.nodeType(target.nodeType()); if (softRebuild) { - // Soft rebuild is enabled so this should act on hosts having replacable root disk + // Soft rebuild is enabled so this should act on hosts having replaceable root disk hostsOfTargetType = hostsOfTargetType.replaceableRootDisk(); } |