aboutsummaryrefslogtreecommitdiffstats
path: root/configserver
diff options
context:
space:
mode:
authorHarald Musum <musum@yahooinc.com>2022-01-18 09:27:15 +0100
committerHarald Musum <musum@yahooinc.com>2022-01-18 09:27:15 +0100
commitd53a482fec4bbeea9debdfe920112e4ae84cd3f4 (patch)
tree8998be20754b0253a49f3129d0da994c2e185356 /configserver
parenteefefc5e045536ac9e390c9c7ff5cc07693e7b60 (diff)
Fetch feature flag with application id
Diffstat (limited to 'configserver')
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java5
1 files changed, 4 insertions, 1 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 49dade6f0cd..7d59a912542 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
@@ -30,6 +30,7 @@ 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;
@@ -177,7 +178,9 @@ 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());
+ BooleanFlag verify = Flags.CHECK_CONFIG_CONVERGENCE_BEFORE_RESTARTING
+ .bindTo(applicationRepository.flagSource())
+ .with(FetchVector.Dimension.APPLICATION_ID, applicationId.serializedForm());
if ( ! verify.value()) return;
// Timeout per service when getting config generations