Fix docker metrics unset race condition after vespa upgrade

1 files changed, 5 insertions, 1 deletions

diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java
index 090ba7e2d5c..f7eeffd7367 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java
@@ -53,6 +53,7 @@ public class NodeAgentImpl implements NodeAgent {
     private final PrefixLogger logger;
 
     private DockerImage imageBeingDownloaded = null;
+    private Optional<String> vespaVersion = Optional.empty();
 
     private final String hostname;
 
@@ -232,6 +233,9 @@ public class NodeAgentImpl implements NodeAgent {
 
     private void startContainerIfNeeded(final ContainerNodeSpec nodeSpec) {
         if (dockerOperations.startContainerIfNeeded(nodeSpec)) {
+            vespaVersion = dockerOperations.getVespaVersion(nodeSpec.containerName);
+            metricReceiver.unsetMetricsForContainer(hostname);
+
             configureContainerMetrics(nodeSpec);
             addDebugMessage("startContainerIfNeeded: containerState " + containerState + " -> " +
                             RUNNING_HOWEVER_RESUME_SCRIPT_NOT_RUN);
@@ -491,7 +495,7 @@ public class NodeAgentImpl implements NodeAgent {
                     .add("clusterid", nodeSpec.membership.get().clusterId);
         }
 
-        if (nodeSpec.vespaVersion.isPresent()) dimensionsBuilder.add("vespaVersion", nodeSpec.vespaVersion.get());
+        if (vespaVersion.isPresent()) dimensionsBuilder.add("vespaVersion", vespaVersion.get());
 
         Dimensions dimensions = dimensionsBuilder.build();
         long currentCpuContainerTotalTime = ((Number) ((Map) stats.getCpuStats().get("cpu_usage")).get("total_usage")).longValue();