Merge pull request #6506 from vespa-engine/mpolden/fix-race

Fix race

2 files changed, 1 insertions, 3 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/ApplicationMaintainer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/ApplicationMaintainer.java
index 62dc9c2395f..e3df6199d06 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/ApplicationMaintainer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/ApplicationMaintainer.java
@@ -71,8 +71,8 @@ public abstract class ApplicationMaintainer extends Maintainer {
         }
         log.log(LogLevel.INFO, application + " will be deployed, last deploy time " +
                                getLastDeployTime(application));
-        deploymentExecutor.execute(() -> deployWithLock(application));
         pendingDeployments.add(application);
+        deploymentExecutor.execute(() -> deployWithLock(application));
     }
 
     protected Deployer deployer() { return deployer; }
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/PeriodicApplicationMaintainerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/PeriodicApplicationMaintainerTest.java
index 3a7bca801a9..7e48edfc805 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/PeriodicApplicationMaintainerTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/PeriodicApplicationMaintainerTest.java
@@ -31,7 +31,6 @@ import com.yahoo.vespa.hosted.provision.testutils.MockDeployer;
 import com.yahoo.vespa.hosted.provision.testutils.MockNameResolver;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import java.time.Duration;
@@ -48,7 +47,6 @@ import static org.junit.Assert.assertFalse;
 /**
  * @author bratseth
  */
-@Ignore
 public class PeriodicApplicationMaintainerTest {
 
     private static final NodeFlavors nodeFlavors = FlavorConfigBuilder.createDummies("default");