diff options
author | Harald Musum <musum@verizonmedia.com> | 2021-02-08 15:09:00 +0100 |
---|---|---|
committer | Harald Musum <musum@verizonmedia.com> | 2021-02-08 15:09:00 +0100 |
commit | 2c515a94dd876464f0754950f1279d2dcd96bf11 (patch) | |
tree | d0a785c5ca206325d705b460849974b7c4d6516d | |
parent | 3bf63b5abac30185ff0dd38b6ed89cba9b16bb4b (diff) |
Allow one node for both branches
-rw-r--r-- | orchestrator/src/main/java/com/yahoo/vespa/orchestrator/policy/HostedVespaClusterPolicy.java | 7 |
1 files changed, 2 insertions, 5 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 3088fd7ae0a..ff1c56f6b2f 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 @@ -56,8 +56,7 @@ public class HostedVespaClusterPolicy implements ClusterPolicy { } @Override - public void verifyGroupGoingDownPermanentlyIsFine(ClusterApi clusterApi) - throws HostStateChangeDeniedException { + public void verifyGroupGoingDownPermanentlyIsFine(ClusterApi clusterApi) throws HostStateChangeDeniedException { // This policy is similar to verifyGroupGoingDownIsFine, except that services being down in the group // is no excuse to allow suspension (like it is for verifyGroupGoingDownIsFine), since if we grant // suspension in this case they will permanently be down/removed. @@ -123,8 +122,7 @@ public class HostedVespaClusterPolicy implements ClusterPolicy { // I proxy host if (clusterApi.serviceType().equals(ServiceType.CLUSTER_CONTROLLER)) { - // All nodes have all state and we need to be able to remove the half that are retired on cluster migration - return ConcurrentSuspensionLimitForCluster.FIFTY_PERCENT; + return ConcurrentSuspensionLimitForCluster.ONE_NODE; } if (Set.of(ServiceType.STORAGE, ServiceType.SEARCH, ServiceType.DISTRIBUTOR, ServiceType.TRANSACTION_LOG_SERVER) @@ -164,7 +162,6 @@ public class HostedVespaClusterPolicy implements ClusterPolicy { } if (ServiceType.CLUSTER_CONTROLLER.equals(clusterApi.serviceType())) { - // All nodes have all state and we need to be able to remove the half that are retired on cluster migration return ConcurrentSuspensionLimitForCluster.ONE_NODE; } |