Merge pull request #5558 from vespa-engine/bjorncs/container-watchdog

Fix bug where container watchdog stored wrong activation time

1 files changed, 4 insertions, 5 deletions

diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/core/ActiveContainerDeactivationWatchdog.java b/jdisc_core/src/main/java/com/yahoo/jdisc/core/ActiveContainerDeactivationWatchdog.java
index b353cdad64a..e41c149c0af 100644
--- a/jdisc_core/src/main/java/com/yahoo/jdisc/core/ActiveContainerDeactivationWatchdog.java
+++ b/jdisc_core/src/main/java/com/yahoo/jdisc/core/ActiveContainerDeactivationWatchdog.java
@@ -95,13 +95,12 @@ class ActiveContainerDeactivationWatchdog implements ActiveContainerMetrics, Aut
     void onContainerActivation(ActiveContainer nextContainer) {
         synchronized (monitor) {
             Instant now = clock.instant();
-            ActiveContainer previousContainer = currentContainer;
+            if (currentContainer != null) {
+                deactivatedContainers.put(currentContainer, new LifecycleStats(currentContainerActivationTime, now));
+                destructorReferences.add(new ActiveContainerPhantomReference(currentContainer, garbageCollectedContainers));
+            }
             currentContainer = nextContainer;
             currentContainerActivationTime = now;
-            if (previousContainer != null) {
-                deactivatedContainers.put(previousContainer, new LifecycleStats(currentContainerActivationTime, now));
-                destructorReferences.add(new ActiveContainerPhantomReference(previousContainer, garbageCollectedContainers));
-            }
         }
     }