diff options
| author | Håkon Hallingstad <hakon@verizonmedia.com> | 2021-02-26 15:21:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-26 15:21:43 +0100 |
| commit | 9a88975744d0225bfa48ea497155768a56d0701b (patch) | |
| tree | 28c365874b5d1bbc96a99ba95312fd0c272bc16c | |
| parent | 22e41080bbc5093ad030129863e0bf23ebeb74e0 (diff) | |
| parent | eafe3ab39c44628f3a584fbd5b895d5f9f5a1438 (diff) | |
Merge pull request #16689 from vespa-engine/revert-16544-revert-16537-hakonhall/enable-group-suspension-by-default-run-systemtest
Enable group suspension by default, attempt 2 [run-systemtest]
| -rw-r--r-- | flags/src/main/java/com/yahoo/vespa/flags/Flags.java | 2 | ||||
| -rw-r--r-- | orchestrator/src/test/java/com/yahoo/vespa/orchestrator/model/ClusterApiImplTest.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java index 1026af7f823..e6b7189455b 100644 --- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java @@ -200,7 +200,7 @@ public class Flags { APPLICATION_ID); public static final UnboundBooleanFlag GROUP_SUSPENSION = defineFeatureFlag( - "group-suspension", false, + "group-suspension", true, List.of("hakon"), "2021-01-22", "2021-03-22", "Allow all content nodes in a hierarchical group to suspend at the same time", "Takes effect on the next suspension request to the Orchestrator.", diff --git a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/model/ClusterApiImplTest.java b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/model/ClusterApiImplTest.java index bc621bfc6aa..412a08a8305 100644 --- a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/model/ClusterApiImplTest.java +++ b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/model/ClusterApiImplTest.java @@ -114,8 +114,8 @@ public class ClusterApiImplTest { } catch (HostStateChangeDeniedException e) { assertThat(e.getMessage(), containsString("Changing the state of cfg1 would violate enough-services-up: " + - "Suspension of service with type 'configserver' would increase from 33% to 66%, " + - "over the limit of 10%. Services down on resumed hosts: [1 missing config server].")); + "Suspension of service with type 'configserver' not allowed: 33% are suspended already. " + + "Services down on resumed hosts: [1 missing config server].")); } flagSource.withBooleanFlag(Flags.GROUP_SUSPENSION.id(), true); |