diff options
| author | Arnstein Ressem <aressem@verizonmedia.com> | 2021-02-16 21:56:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-16 21:56:17 +0100 |
| commit | bf740783bd85cb13ffeca899af53ae7b7112d625 (patch) | |
| tree | 692d5a429a60a5f83d425eee9c44b2599209c482 | |
| parent | 444796ec598624a8ff6f62813a30a13d26eb3a53 (diff) | |
| parent | 5c7ebe6fa125672a11e69dc5b2e6d49824339bcc (diff) | |
Merge pull request #16544 from vespa-engine/revert-16537-hakonhall/enable-group-suspension-by-default-run-systemtest
Revert "Enable group suspension by default [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 e0a58a954b0..9bbd3e4bc7a 100644 --- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java @@ -206,7 +206,7 @@ public class Flags { APPLICATION_ID); public static final UnboundBooleanFlag GROUP_SUSPENSION = defineFeatureFlag( - "group-suspension", true, + "group-suspension", false, 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 412a08a8305..bc621bfc6aa 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' not allowed: 33% are suspended already. " + - "Services down on resumed hosts: [1 missing config server].")); + "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].")); } flagSource.withBooleanFlag(Flags.GROUP_SUSPENSION.id(), true); |