diff options
| -rw-r--r-- | flags/src/main/java/com/yahoo/vespa/flags/Flags.java | 7 | ||||
| -rw-r--r-- | orchestrator/src/main/java/com/yahoo/vespa/orchestrator/policy/HostedVespaPolicy.java | 15 |
2 files changed, 3 insertions, 19 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 7934215c165..0cf8f3756b6 100644 --- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java @@ -68,13 +68,6 @@ public class Flags { "Takes effect at redeployment (requires restart)", ZONE_ID, APPLICATION_ID); - public static final UnboundBooleanFlag KEEP_STORAGE_NODE_UP = defineFeatureFlag( - "keep-storage-node-up", true, - List.of("hakonhall"), "2022-07-07", "2022-12-07", - "Whether to leave the storage node (with wanted state) UP while the node is permanently down.", - "Takes effect immediately for nodes transitioning to permanently down.", - ZONE_ID, APPLICATION_ID); - public static final UnboundIntFlag MAX_UNCOMMITTED_MEMORY = defineIntFlag( "max-uncommitted-memory", 130000, List.of("geirst, baldersheim"), "2021-10-21", "2023-01-01", diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/policy/HostedVespaPolicy.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/policy/HostedVespaPolicy.java index 3f23be5e514..a54ca98d4df 100644 --- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/policy/HostedVespaPolicy.java +++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/policy/HostedVespaPolicy.java @@ -34,7 +34,6 @@ public class HostedVespaPolicy implements Policy { private final HostedVespaClusterPolicy clusterPolicy; private final ClusterControllerClientFactory clusterControllerClientFactory; private final ApplicationApiFactory applicationApiFactory; - private final BooleanFlag keepStorageNodeUpFlag; public HostedVespaPolicy(HostedVespaClusterPolicy clusterPolicy, ClusterControllerClientFactory clusterControllerClientFactory, @@ -43,7 +42,6 @@ public class HostedVespaPolicy implements Policy { this.clusterPolicy = clusterPolicy; this.clusterControllerClientFactory = clusterControllerClientFactory; this.applicationApiFactory = applicationApiFactory; - this.keepStorageNodeUpFlag = Flags.KEEP_STORAGE_NODE_UP.bindTo(flagSource); } @Override @@ -101,18 +99,11 @@ public class HostedVespaPolicy implements Policy { clusterPolicy.verifyGroupGoingDownPermanentlyIsFine(cluster); } - boolean keepStorageNodeUp = keepStorageNodeUpFlag - .with(FetchVector.Dimension.APPLICATION_ID, applicationApi.applicationId().serializedForm()) - .value(); - // Get permission from the Cluster Controller to remove the content nodes. for (StorageNode storageNode : applicationApi.getStorageNodesInGroupInClusterOrder()) { - if (keepStorageNodeUp) { - storageNode.setStorageNodeState(context.createSubcontextForSingleAppOp(true), ClusterControllerNodeState.DOWN); - storageNode.forceDistributorState(context, ClusterControllerNodeState.DOWN); - } else { - storageNode.setStorageNodeState(context, ClusterControllerNodeState.DOWN); - } + // Consider changing the semantics of setting storage node state to DOWN in cluster controller, to avoid 2 calls. + storageNode.setStorageNodeState(context.createSubcontextForSingleAppOp(true), ClusterControllerNodeState.DOWN); + storageNode.forceDistributorState(context, ClusterControllerNodeState.DOWN); } // Ensure all nodes in the group are marked as permanently down |