diff options
3 files changed, 0 insertions, 18 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java index 3f222f759c1..e6159cbfa33 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java @@ -29,9 +29,6 @@ import com.yahoo.vespa.config.server.configchange.RestartActions; import com.yahoo.vespa.config.server.session.PrepareParams; import com.yahoo.vespa.config.server.session.Session; import com.yahoo.vespa.config.server.tenant.Tenant; -import com.yahoo.vespa.flags.BooleanFlag; -import com.yahoo.vespa.flags.FetchVector; -import com.yahoo.vespa.flags.Flags; import java.time.Clock; import java.time.Duration; @@ -178,11 +175,6 @@ public class Deployment implements com.yahoo.config.provision.Deployment { } private void waitForConfigToConverge(ApplicationId applicationId) { - BooleanFlag verify = Flags.CHECK_CONFIG_CONVERGENCE_BEFORE_RESTARTING - .bindTo(applicationRepository.flagSource()) - .with(FetchVector.Dimension.APPLICATION_ID, applicationId.serializedForm()); - if ( ! verify.value()) return; - deployLogger.log(Level.INFO, "Wait for all services to use new config generation before restarting"); while (true) { try { diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/HostedDeployTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/HostedDeployTest.java index 143f9a8e80d..a6d7cf02bc7 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/HostedDeployTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/HostedDeployTest.java @@ -30,8 +30,6 @@ import com.yahoo.vespa.config.server.http.UnknownVespaVersionException; import com.yahoo.vespa.config.server.http.v2.PrepareResult; import com.yahoo.vespa.config.server.model.TestModelFactory; import com.yahoo.vespa.config.server.session.PrepareParams; -import com.yahoo.vespa.flags.Flags; -import com.yahoo.vespa.flags.InMemoryFlagSource; import com.yahoo.vespa.model.application.validation.change.VespaReindexAction; import com.yahoo.vespa.model.application.validation.change.VespaRestartAction; import org.junit.Rule; @@ -442,7 +440,6 @@ public class HostedDeployTest { .zone(prodZone) .hostProvisioner(new InMemoryProvisioner(new Hosts(hosts), true, false)) .configConvergenceChecker(new MockConfigConvergenceChecker(2)) - .flagSource(new InMemoryFlagSource().withBooleanFlag(Flags.CHECK_CONFIG_CONVERGENCE_BEFORE_RESTARTING.id(), true)) .build(); PrepareResult prepareResult = tester.deployApp("src/test/apps/hosted/", "6.1.0"); 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 394b0992dd6..6b31676ead9 100644 --- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java @@ -336,13 +336,6 @@ public class Flags { "Takes effect on redeployment", ZONE_ID, APPLICATION_ID); - public static final UnboundBooleanFlag CHECK_CONFIG_CONVERGENCE_BEFORE_RESTARTING = defineFeatureFlag( - "check-config-convergence-before-restart", true, - List.of("hmusum"), "2022-01-16", "2022-02-16", - "Check that config has converged to new generation on all services before restarting services", - "Takes effect immediately", - ZONE_ID, APPLICATION_ID); - public static final UnboundBooleanFlag USE_QRSERVER_SERVICE_NAME = defineFeatureFlag( "use-qrserver-service-name", true, List.of("arnej"), "2022-01-18", "2022-12-31", |