summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHÃ¥kon Hallingstad <hakon@verizonmedia.com>2020-03-13 16:02:51 +0100
committerGitHub <noreply@github.com>2020-03-13 16:02:51 +0100
commitd67466be724f2d90949739b2abd4082dbb314c5c (patch)
treedd49d2ef7739587d5c7c65441fe3caeae59d3aa2
parent19f1b6a9aec19aac1b3f34cf315bbd68a80f9fd3 (diff)
parent0927cbd80b0ad7c5a12c894dc066c92bea9a7ad4 (diff)
Merge pull request #12562 from vespa-engine/hakonhall/reduce-host-admin-suspension-concurrencty-from-20-to-10
Reduce host admin suspension concurrency from 20% to 10%
-rw-r--r--orchestrator/src/main/java/com/yahoo/vespa/orchestrator/policy/HostedVespaClusterPolicy.java2
-rw-r--r--orchestrator/src/test/java/com/yahoo/vespa/orchestrator/policy/HostedVespaClusterPolicyTest.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/policy/HostedVespaClusterPolicy.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/policy/HostedVespaClusterPolicy.java
index ccb0bb57186..2ac996c843c 100644
--- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/policy/HostedVespaClusterPolicy.java
+++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/policy/HostedVespaClusterPolicy.java
@@ -81,7 +81,7 @@ public class HostedVespaClusterPolicy implements ClusterPolicy {
}
if (clusterApi.getApplication().applicationId().equals(VespaModelUtil.TENANT_HOST_APPLICATION_ID)) {
- return ConcurrentSuspensionLimitForCluster.TWENTY_PERCENT;
+ return ConcurrentSuspensionLimitForCluster.TEN_PERCENT;
}
return ConcurrentSuspensionLimitForCluster.TEN_PERCENT;
diff --git a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/policy/HostedVespaClusterPolicyTest.java b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/policy/HostedVespaClusterPolicyTest.java
index 4462e886d1b..dd79212f22c 100644
--- a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/policy/HostedVespaClusterPolicyTest.java
+++ b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/policy/HostedVespaClusterPolicyTest.java
@@ -56,7 +56,7 @@ public class HostedVespaClusterPolicyTest {
public void testTenantHostSuspensionLimit() {
when(applicationApi.applicationId()).thenReturn(VespaModelUtil.TENANT_HOST_APPLICATION_ID);
when(clusterApi.isStorageCluster()).thenReturn(false);
- assertEquals(ConcurrentSuspensionLimitForCluster.TWENTY_PERCENT,
+ assertEquals(ConcurrentSuspensionLimitForCluster.TEN_PERCENT,
policy.getConcurrentSuspensionLimit(clusterApi));
}