Move log back to NASU

2 files changed, 10 insertions, 11 deletions

diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminStateUpdater.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminStateUpdater.java
index 28a3e768d93..8dbada334b8 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminStateUpdater.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminStateUpdater.java
@@ -73,6 +73,7 @@ public class NodeAdminStateUpdater {
             Clock clock,
             Duration nodeAdminConvergeStateInterval,
             ClassLocking classLocking) {
+        log.info(objectToString() + ": Creating object");
         this.nodeRepository = nodeRepository;
         this.orchestrator = orchestrator;
         this.nodeAdmin = nodeAdmin;
@@ -83,12 +84,14 @@ public class NodeAdminStateUpdater {
         this.lastTick = clock.instant();
 
         this.loopThread = new Thread(() -> {
+            log.info(objectToString() + ": Acquiring lock");
             try {
                 classLock = classLocking.tryLock(NodeAdminStateUpdater.class, () -> !terminated.get());
             } catch (LockInterruptException e) {
                 return;
             }
 
+            log.info(objectToString() + ": Starting threads and schedulers");
             nodeAdmin.start();
             specVerifierScheduler.scheduleWithFixedDelay(() ->
                     updateHardwareDivergence(storageMaintainer), 5, 60, TimeUnit.MINUTES);
@@ -100,6 +103,10 @@ public class NodeAdminStateUpdater {
         this.loopThread.setName("tick-NodeAdminStateUpdater");
     }
 
+    private String objectToString() {
+        return this.getClass().getSimpleName() + "@" + Integer.toString(System.identityHashCode(this));
+    }
+
     public enum State { RESUMED, SUSPENDED_NODE_ADMIN, SUSPENDED}
 
     public Map<String, Object> getDebugPage() {
@@ -283,6 +290,7 @@ public class NodeAdminStateUpdater {
     }
 
     public void stop() {
+        log.info(objectToString() + ": Stop called");
         if (!terminated.compareAndSet(false, true)) {
             throw new RuntimeException("Can not re-stop a node agent.");
         }
@@ -307,8 +315,10 @@ public class NodeAdminStateUpdater {
         // Finally, stop NodeAdmin and all the NodeAgents
         nodeAdmin.stop();
 
+        log.info(objectToString() + ": Releasing lock");
         if (classLock != null) {
             classLock.close();
         }
+        log.info(objectToString() + ": Stop complete");
     }
 }
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/provider/NodeAdminProvider.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/provider/NodeAdminProvider.java
index 12b0b4d1014..109dbab924c 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/provider/NodeAdminProvider.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/provider/NodeAdminProvider.java
@@ -28,7 +28,6 @@ import com.yahoo.vespa.hosted.node.admin.util.Environment;
 import java.time.Clock;
 import java.time.Duration;
 import java.util.function.Function;
-import java.util.logging.Logger;
 
 import static com.yahoo.vespa.defaults.Defaults.getDefaults;
 
@@ -43,13 +42,10 @@ public class NodeAdminProvider implements Provider<NodeAdminStateUpdater> {
     private static final Duration NODE_AGENT_SCAN_INTERVAL = Duration.ofSeconds(30);
     private static final Duration NODE_ADMIN_CONVERGE_STATE_INTERVAL = Duration.ofSeconds(30);
 
-    private final Logger log = Logger.getLogger(NodeAdminProvider.class.getName());
     private final NodeAdminStateUpdater nodeAdminStateUpdater;
 
     @Inject
     public NodeAdminProvider(Docker docker, MetricReceiverWrapper metricReceiver, ClassLocking classLocking) {
-        log.info(objectToString() + ": Creating object");
-
         Clock clock = Clock.systemUTC();
         String dockerHostHostName = HostName.getLocalhost();
         ProcessExecuter processExecuter = new ProcessExecuter();
@@ -82,13 +78,6 @@ public class NodeAdminProvider implements Provider<NodeAdminStateUpdater> {
 
     @Override
     public void deconstruct() {
-        log.info(objectToString() + ": Stop called");
         nodeAdminStateUpdater.stop();
-        log.info(objectToString() + ": Stop complete");
-    }
-
-
-    private String objectToString() {
-        return this.getClass().getSimpleName() + "@" + Integer.toString(System.identityHashCode(this));
     }
 }