aboutsummaryrefslogtreecommitdiffstats
path: root/node-repository/src
diff options
context:
space:
mode:
authorjonmv <venstad@gmail.com>2023-06-23 14:43:16 +0200
committerjonmv <venstad@gmail.com>2023-06-23 14:43:16 +0200
commit695d4d5bc12ccdf06caf4c17770817d32da27169 (patch)
tree8cb535f1a257b8baa879ae79f9b5f4d739fe3940 /node-repository/src
parent48af26fa470c68c5cff38af565ac1beb5b980285 (diff)
Return immutable, fix test code instead
Diffstat (limited to 'node-repository/src')
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDb.java2
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNodeRepository.java2
-rw-r--r--node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/SpareCapacityMaintainerTest.java2
3 files changed, 3 insertions, 3 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDb.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDb.java
index 28598710ea8..037338cb2ed 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDb.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDb.java
@@ -117,7 +117,7 @@ public class CuratorDb {
curatorTransaction.add(CuratorOperations.create(nodePath(node).getAbsolute(), serialized));
}
transaction.onCommitted(() -> nodes.forEach(node -> log.log(Level.INFO, "Added " + node)));
- return new ArrayList<>(nodes.asList());
+ return nodes.asList();
}
public List<Node> addNodesInState(LockedNodeList nodes, Node.State expectedState, Agent agent) {
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNodeRepository.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNodeRepository.java
index b7d6e0a9dd9..714374ccb8a 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNodeRepository.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNodeRepository.java
@@ -176,7 +176,7 @@ public class MockNodeRepository extends NodeRepository {
.build());
// Ready all nodes, except 7 and 55
- nodes = nodes().addNodes(nodes, Agent.system);
+ nodes = new ArrayList<>(nodes().addNodes(nodes, Agent.system));
nodes.remove(node7);
nodes.remove(node55);
nodes = nodes().deallocate(nodes, Agent.system, getClass().getSimpleName());
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/SpareCapacityMaintainerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/SpareCapacityMaintainerTest.java
index 9cd1d6cd6d6..a5ac2be72ee 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/SpareCapacityMaintainerTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/SpareCapacityMaintainerTest.java
@@ -315,7 +315,7 @@ public class SpareCapacityMaintainerTest {
}
private void allocate(ApplicationId application, ClusterSpec clusterSpec, List<Node> nodes) {
- nodes = nodeRepository.nodes().addNodes(nodes, Agent.system);
+ nodes = new ArrayList<>(nodeRepository.nodes().addNodes(nodes, Agent.system));
for (int i = 0; i < nodes.size(); i++) {
Node node = nodes.get(i);
ClusterMembership membership = ClusterMembership.from(clusterSpec, i);