diff options
| author | Harald Musum <musum@verizonmedia.com> | 2021-10-18 19:47:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-18 19:47:06 +0200 |
| commit | 3851833f09fbfc82c6b350d3503088bb1a683b07 (patch) | |
| tree | 2e372c6b79877f3918f03fa919c7ffaf006a7996 | |
| parent | a811ab1b07c9fd1310b5a1e392d8e0a82df0a3ac (diff) | |
| parent | d94881f34e904642c4c82df437565333b2ae9c39 (diff) | |
Merge pull request #19615 from vespa-engine/hmusum/stop-using-USE_APPLICATION_LOCK_IN_MAINTENANCE_DEPLOYMENTv7.485.19
Stop using USE_APPLICATION_LOCK_IN_MAINTENANCE_DEPLOYMENT feature flag
| -rw-r--r-- | flags/src/main/java/com/yahoo/vespa/flags/Flags.java | 1 | ||||
| -rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MaintenanceDeployment.java | 7 |
2 files changed, 2 insertions, 6 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 9393b0305b0..b19ff1ae176 100644 --- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java @@ -309,6 +309,7 @@ public class Flags { ZONE_ID, TENANT_ID ); + // TODO: Delete when oldest model version in use is 7.486 public static final UnboundBooleanFlag USE_APPLICATION_LOCK_IN_MAINTENANCE_DEPLOYMENT = defineFeatureFlag( "use-application-lock-in-maintenance-deployment", true, List.of("hmusum"), "2021-09-16", "2021-11-01", diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MaintenanceDeployment.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MaintenanceDeployment.java index ff696e727fa..1f9a37d517a 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MaintenanceDeployment.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MaintenanceDeployment.java @@ -24,8 +24,6 @@ import java.util.function.Supplier; import java.util.logging.Level; import java.util.logging.Logger; -import static com.yahoo.vespa.flags.Flags.USE_APPLICATION_LOCK_IN_MAINTENANCE_DEPLOYMENT; - /** * A wrapper of a deployment suitable for maintenance. * This is a single-use, single-thread object. @@ -50,10 +48,7 @@ class MaintenanceDeployment implements Closeable { this.application = application; this.metric = metric; - Optional<Mutex> lock = USE_APPLICATION_LOCK_IN_MAINTENANCE_DEPLOYMENT.bindTo(nodeRepository.flagSource()).value() - ? tryLock(application, nodeRepository) - : Optional.of(() -> { }); - + Optional<Mutex> lock = tryLock(application, nodeRepository); try { deployment = tryDeployment(lock, application, deployer, nodeRepository); this.lock = lock; |