Fallback to last activation time if we cannot find last deploy time

Also log application id if maintainer fails finding last deploy time

2 files changed, 21 insertions, 6 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 1aeaebafd84..a78eeb902c0 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
@@ -476,10 +476,17 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye
                 .flatMap(ApplicationData::lastDeployedSession);
         if (lastDeployedSession.isEmpty()) return activationTime(application);
 
-        Instant createTime = getRemoteSession(tenant, lastDeployedSession.get()).getCreateTime();
+        Optional<Instant> createTime;
+        try {
+            createTime = Optional.of(getRemoteSession(tenant, lastDeployedSession.get()).getCreateTime());
+        }
+        catch (Exception e) {
+            // Fallback to activation time, e.g. when last deployment failed before writing session data for new session
+            createTime = activationTime(application);
+        }
         log.log(Level.FINEST, application + " last deployed " + createTime);
 
-        return Optional.of(createTime);
+        return createTime;
     }
 
     @Override
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/PeriodicApplicationMaintainer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/PeriodicApplicationMaintainer.java
index 9cbf1778b3b..e3e98efbe8d 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/PeriodicApplicationMaintainer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/PeriodicApplicationMaintainer.java
@@ -11,10 +11,12 @@ import com.yahoo.vespa.flags.PermanentFlags;
 import com.yahoo.vespa.hosted.provision.Node;
 import com.yahoo.vespa.hosted.provision.NodeList;
 import com.yahoo.vespa.hosted.provision.NodeRepository;
+import com.yahoo.yolean.Exceptions;
 
 import java.time.Duration;
 import java.util.Map;
 
+import static java.util.logging.Level.INFO;
 import static java.util.stream.Collectors.toMap;
 
 /**
@@ -38,10 +40,16 @@ public class PeriodicApplicationMaintainer extends ApplicationMaintainer {
 
     @Override
     protected boolean canDeployNow(ApplicationId application) {
-        return deployer().deployTime(application)
-                         .map(lastDeployTime ->    lastDeployTime.isBefore(nodeRepository().clock().instant().minus(minTimeBetweenRedeployments))
-                                                || deployer().readiedReindexingAfter(application, lastDeployTime))
-                         .orElse(false);
+        try {
+            return deployer().deployTime(application)
+                    .map(lastDeployTime ->    lastDeployTime.isBefore(nodeRepository().clock().instant().minus(minTimeBetweenRedeployments))
+                            || deployer().readiedReindexingAfter(application, lastDeployTime))
+                    .orElse(false);
+        }
+        catch (Exception e) {
+            log.log(INFO, () -> "Failed finding last deploy time or reindexing status for " + application + Exceptions.toMessageString(e));
+            throw e;
+        }
     }
 
     @Override