aboutsummaryrefslogtreecommitdiffstats
path: root/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance
diff options
context:
space:
mode:
authorHarald Musum <musum@yahooinc.com>2023-09-04 14:22:12 +0200
committerHarald Musum <musum@yahooinc.com>2023-09-04 14:22:12 +0200
commit7ebc95a2f6fb93e851a961adf62693502c2ed3b6 (patch)
treeef30e12b1b985dad4ebddd043780df9abbe9fee1 /node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance
parent3e4a2ecdd9ad0b3dab563fd8572644bb3cfae2e3 (diff)
Log both last deployed and last activated time
Diffstat (limited to 'node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance')
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/ApplicationMaintainer.java7
1 files changed, 6 insertions, 1 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 91a10a1d08e..6b084704474 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
@@ -80,7 +80,7 @@ public abstract class ApplicationMaintainer extends NodeRepositoryMaintainer {
if ( ! canDeployNow(application)) return; // redeployment is no longer needed
log.log(Level.INFO, () -> application + " will be redeployed" +
(reason == null || reason.isBlank() ? "" : " due to " + reason) +
- ", last activated " + activationTime(application));
+ ", last deployed " + deployTime(application) + " and last activated " + activationTime(application));
deployment.activate();
} finally {
pendingDeployments.remove(application);
@@ -92,6 +92,11 @@ public abstract class ApplicationMaintainer extends NodeRepositoryMaintainer {
return deployer.activationTime(application).orElse(Instant.EPOCH);
}
+ /** Returns the last time application was deployed. Epoch is returned if the application has never been deployed. */
+ protected final Instant deployTime(ApplicationId application) {
+ return deployer.deployTime(application).orElse(Instant.EPOCH);
+ }
+
@Override
public void shutdown() {
super.shutdown();