From 024b79b2ff4cd92f63f7dcb8e19f6d96a95ef8a9 Mon Sep 17 00:00:00 2001 From: Martin Polden Date: Mon, 12 Apr 2021 21:20:48 +0200 Subject: Extract constant --- .../com/yahoo/vespa/hosted/provision/os/DelegatingOsUpgrader.java | 3 ++- .../main/java/com/yahoo/vespa/hosted/provision/os/OsVersions.java | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'node-repository') diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/os/DelegatingOsUpgrader.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/os/DelegatingOsUpgrader.java index af17934a878..84454e0d06a 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/os/DelegatingOsUpgrader.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/os/DelegatingOsUpgrader.java @@ -31,7 +31,8 @@ public class DelegatingOsUpgrader implements OsUpgrader { public DelegatingOsUpgrader(NodeRepository nodeRepository, int maxActiveUpgrades) { this.nodeRepository = Objects.requireNonNull(nodeRepository); this.maxActiveUpgrades = maxActiveUpgrades; - if (maxActiveUpgrades < 1) throw new IllegalArgumentException("maxActiveUpgrades must be positive"); + if (maxActiveUpgrades < 1) throw new IllegalArgumentException("maxActiveUpgrades must be positive, was " + + maxActiveUpgrades); } @Override diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/os/OsVersions.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/os/OsVersions.java index 613738458c2..1366c323f1e 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/os/OsVersions.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/os/OsVersions.java @@ -30,13 +30,16 @@ public class OsVersions { private static final Logger log = Logger.getLogger(OsVersions.class.getName()); + /** The maximum number of concurrent upgrades triggered by {@link DelegatingOsUpgrader} */ + private static final int MAX_DELEGATED_UPGRADES = 30; + private final NodeRepository nodeRepository; private final CuratorDatabaseClient db; private final boolean reprovisionToUpgradeOs; private final int maxDelegatedUpgrades; public OsVersions(NodeRepository nodeRepository) { - this(nodeRepository, nodeRepository.zone().getCloud().reprovisionToUpgradeOs(), 30); + this(nodeRepository, nodeRepository.zone().getCloud().reprovisionToUpgradeOs(), MAX_DELEGATED_UPGRADES); } OsVersions(NodeRepository nodeRepository, boolean reprovisionToUpgradeOs, int maxDelegatedUpgrades) { -- cgit v1.2.3