Log when NodeAgent starts and stops

2 files changed, 10 insertions, 2 deletions

diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImpl.java
index 84679d1dadd..e42b360fcb7 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImpl.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImpl.java
@@ -235,7 +235,11 @@ public class NodeAdminImpl implements NodeAdmin {
                 existingContainers.stream(), containerName -> containerName);
 
         final Set<ContainerName> obsoleteAgentContainerNames = diff(nodeAgents.keySet(), new HashSet<>(hostnameByContainerName.keySet()));
-        obsoleteAgentContainerNames.forEach(containerName -> nodeAgents.remove(containerName).stop());
+
+        for (ContainerName containerName : obsoleteAgentContainerNames) {
+            nodeAgents.remove(containerName).stop();
+            logger.warning("Stopped node agent for " + containerName.asString());
+        }
 
         nodeSpecContainerPairs.forEach(nodeSpecContainerPair -> {
             final Optional<ContainerName> nodeSpec = nodeSpecContainerPair.getFirst();
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 2e81ef19f5e..9d2198cedcc 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
@@ -180,7 +180,9 @@ public class NodeAgentImpl implements NodeAgent {
 
     @Override
     public void start(int intervalMillis) {
-        addDebugMessage("Starting with interval " + intervalMillis + "ms");
+        String message = "Starting with interval " + intervalMillis + " ms";
+        logger.info(message);
+        addDebugMessage(message);
         delaysBetweenEachConvergeMillis = intervalMillis;
         if (loopThread != null) {
             throw new RuntimeException("Can not restart a node agent.");
@@ -214,6 +216,8 @@ public class NodeAgentImpl implements NodeAgent {
         } catch (InterruptedException e) {
             logger.error("Interrupted; Could not stop filebeatrestarter thread");
         }
+
+        logger.info("Stopped");
     }
 
     private void runLocalResumeScriptIfNeeded() {