From 91e00e97c5e8c19ef745f969070148cbc4b7d241 Mon Sep 17 00:00:00 2001 From: Valerij Fredriksen Date: Mon, 25 Jan 2021 10:29:57 +0100 Subject: Remove wait-for-resources feature flag --- .../java/com/yahoo/vespa/config/server/ApplicationRepository.java | 5 +---- .../main/java/com/yahoo/vespa/config/server/deploy/Deployment.java | 4 ++-- flags/src/main/java/com/yahoo/vespa/flags/Flags.java | 6 ------ 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java index f2f5eb3afa1..a72381d4e84 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java @@ -140,7 +140,6 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye private final TesterClient testerClient; private final Metric metric; private final ClusterReindexingStatusClient clusterReindexingStatusClient; - private final BooleanFlag waitForResourcesInPrepareFlag; @Inject public ApplicationRepository(TenantRepository tenantRepository, @@ -193,7 +192,6 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye this.testerClient = Objects.requireNonNull(testerClient); this.metric = Objects.requireNonNull(metric); this.clusterReindexingStatusClient = clusterReindexingStatusClient; - this.waitForResourcesInPrepareFlag = Flags.WAIT_FOR_RESOURCES_IN_PREPARE.bindTo(flagSource); } public static class Builder { @@ -401,10 +399,9 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye SessionRepository sessionRepository = tenant.getSessionRepository(); DeployLogger logger = new SilentDeployLogger(); Session newSession = sessionRepository.createSessionFromExisting(activeSession, true, timeoutBudget); - boolean waitForResourcesInPrepare = waitForResourcesInPrepareFlag.value(); return Optional.of(Deployment.unprepared(newSession, this, hostProvisioner, tenant, logger, timeout, clock, - false /* don't validate as this is already deployed */, bootstrap, waitForResourcesInPrepare)); + false /* don't validate as this is already deployed */, bootstrap)); } @Override 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 ff2bbc12e29..980134f8884 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 @@ -81,8 +81,8 @@ public class Deployment implements com.yahoo.config.provision.Deployment { public static Deployment unprepared(Session session, ApplicationRepository applicationRepository, Optional provisioner, Tenant tenant, DeployLogger logger, - Duration timeout, Clock clock, boolean validate, boolean isBootstrap, boolean waitForResourcesInPrepare) { - Supplier params = createPrepareParams(clock, timeout, session, isBootstrap, !validate, false, waitForResourcesInPrepare); + Duration timeout, Clock clock, boolean validate, boolean isBootstrap) { + Supplier params = createPrepareParams(clock, timeout, session, isBootstrap, !validate, false, true); return new Deployment(session, applicationRepository, params, provisioner, tenant, logger, clock, true, false); } 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 e216fc131eb..e80ad6b4117 100644 --- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java @@ -58,12 +58,6 @@ public class Flags { "Takes effect on the next run of RetiredExpirer.", HOSTNAME); - public static final UnboundBooleanFlag WAIT_FOR_RESOURCES_IN_PREPARE = defineFeatureFlag( - "wait-for-resources-in-prepare", false, - List.of("freva"), "2021-01-21", "2021-04-01", - "Whether deployment prepare should wait until all resources (parent hosts, LBs, etc.) are ready before returning", - "Takes effect at redeployment."); - public static final UnboundDoubleFlag DEFAULT_TERM_WISE_LIMIT = defineDoubleFlag( "default-term-wise-limit", 1.0, List.of("baldersheim"), "2020-12-02", "2021-02-01", -- cgit v1.2.3