Write configs on container start as well

1 files changed, 10 insertions, 4 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 4efa74dbd8e..b160b4ac364 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
@@ -239,6 +239,8 @@ public class NodeAgentImpl implements NodeAgent {
         dockerOperations.startContainer(containerName, nodeSpec);
         lastCpuMetric = new CpuUsageReporter(clock.instant());
 
+        writeConfigs(nodeSpec);
+
         addDebugMessage("startContainerIfNeeded: containerState " + containerState + " -> " +
                 RUNNING_HOWEVER_RESUME_SCRIPT_NOT_RUN);
         containerState = RUNNING_HOWEVER_RESUME_SCRIPT_NOT_RUN;
@@ -410,10 +412,7 @@ public class NodeAgentImpl implements NodeAgent {
             // TODO: Should be retried if writing fails
             metricReceiver.unsetMetricsForContainer(hostname);
             if (container.isPresent()) {
-                storageMaintainer.ifPresent(maintainer -> {
-                    maintainer.writeMetricsConfig(containerName, nodeSpec);
-                    maintainer.writeFilebeatConfig(containerName, nodeSpec);
-                });
+                writeConfigs(nodeSpec);
             }
         }
 
@@ -606,6 +605,13 @@ public class NodeAgentImpl implements NodeAgent {
         }
     }
 
+    private void writeConfigs(ContainerNodeSpec nodeSpec) {
+        storageMaintainer.ifPresent(maintainer -> {
+            maintainer.writeMetricsConfig(containerName, nodeSpec);
+            maintainer.writeFilebeatConfig(containerName, nodeSpec);
+        });
+    }
+
     private Optional<Container> getContainer() {
         if (containerState == ABSENT) return Optional.empty();
         return dockerOperations.getContainer(containerName);