diff options
Diffstat (limited to 'config-provisioning')
-rw-r--r-- | config-provisioning/src/main/java/com/yahoo/config/provision/Capacity.java | 4 | ||||
-rw-r--r-- | config-provisioning/src/main/java/com/yahoo/config/provision/Deployer.java | 16 |
2 files changed, 6 insertions, 14 deletions
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/Capacity.java b/config-provisioning/src/main/java/com/yahoo/config/provision/Capacity.java index 958a37e1432..182b924e877 100644 --- a/config-provisioning/src/main/java/com/yahoo/config/provision/Capacity.java +++ b/config-provisioning/src/main/java/com/yahoo/config/provision/Capacity.java @@ -58,8 +58,8 @@ public final class Capacity { */ public NodeType type() { return type; } - public Capacity withLimits(ClusterResources min, ClusterResources max) { - return new Capacity(min, max, required, canFail, type); + public Capacity withGroups(int groups) { + return new Capacity(min.withGroups(groups), max.withGroups(groups), required, canFail, type); } @Override diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/Deployer.java b/config-provisioning/src/main/java/com/yahoo/config/provision/Deployer.java index e7d28a3f65b..209f339f51f 100644 --- a/config-provisioning/src/main/java/com/yahoo/config/provision/Deployer.java +++ b/config-provisioning/src/main/java/com/yahoo/config/provision/Deployer.java @@ -16,9 +16,7 @@ public interface Deployer { * Creates a new deployment from the active application, if available. Will use the default timeout for deployment. * * @param application the active application to be redeployed - * @return a new deployment from the local active, or empty if a local active application - * was not present for this id (meaning it either is not active or deployed at another - * node in the config server cluster) + * @return a new deployment from the active application, or empty if application does not exist */ default Optional<Deployment> deployFromLocalActive(ApplicationId application) { return deployFromLocalActive(application, false); @@ -29,9 +27,7 @@ public interface Deployer { * * @param application the active application to be redeployed * @param bootstrap the deployment is done when bootstrapping - * @return a new deployment from the local active, or empty if a local active application - * was not present for this id (meaning it either is not active or deployed at another - * node in the config server cluster) + * @return a new deployment from the active application, or empty if application does not exist */ Optional<Deployment> deployFromLocalActive(ApplicationId application, boolean bootstrap); @@ -41,9 +37,7 @@ public interface Deployer { * * @param application the active application to be redeployed * @param timeout the timeout to use for each individual deployment operation - * @return a new deployment from the local active, or empty if a local active application - * was not present for this id (meaning it either is not active or active on another - * node in the config server cluster) + * @return a new deployment from the active application, or empty if application does not exist */ default Optional<Deployment> deployFromLocalActive(ApplicationId application, Duration timeout) { return deployFromLocalActive(application, timeout, false); @@ -56,9 +50,7 @@ public interface Deployer { * @param application the active application to be redeployed * @param timeout the timeout to use for each individual deployment operation * @param bootstrap the deployment is done when bootstrapping - * @return a new deployment from the local active, or empty if a local active application - * was not present for this id (meaning it either is not active or active on another - * node in the config server cluster) + * @return a new deployment from the active application, or empty if application does not exist */ Optional<Deployment> deployFromLocalActive(ApplicationId application, Duration timeout, boolean bootstrap); |