Merge pull request #6309 from vespa-engine/bratseth/application-deploy-inhibits-maintenance-deploy

Application deployments inhibits periodic redeploys for a while

2 files changed, 15 insertions, 0 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 f60282b637b..1b7ac55ee63 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
@@ -233,6 +233,15 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye
                                                  false /* don't validate as this is already deployed */, version));
     }
 
+    @Override
+    public Optional<Instant> lastDeployTime(ApplicationId application) {
+        Tenant tenant = tenantRepository.getTenant(application.tenant());
+        if (tenant == null) return Optional.empty();
+        LocalSession activeSession = getActiveSession(tenant, application);
+        if (activeSession == null) return Optional.empty();
+        return Optional.of(Instant.ofEpochSecond(activeSession.getCreateTime()));
+    }
+
     public ApplicationId activate(Tenant tenant,
                                   long sessionId,
                                   TimeoutBudget timeoutBudget,
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/MockDeployer.java b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/MockDeployer.java
index 051e7c9a8f9..69176130b4b 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/MockDeployer.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/MockDeployer.java
@@ -5,6 +5,7 @@ import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.Deployment;
 
 import java.time.Duration;
+import java.time.Instant;
 import java.util.Optional;
 
 /**
@@ -25,4 +26,9 @@ public class MockDeployer implements com.yahoo.config.provision.Deployer {
         return Optional.empty();
     }
 
+    @Override
+    public Optional<Instant> lastDeployTime(ApplicationId application) {
+        return Optional.empty();
+    }
+
 }