diff options
author | Valerij Fredriksen <valerijf@oath.com> | 2017-09-20 18:32:14 +0200 |
---|---|---|
committer | Valerij Fredriksen <valerijf@oath.com> | 2017-09-22 09:13:01 +0200 |
commit | 2339012efbabc5e22bf1151b512e1b9c1b90126e (patch) | |
tree | 8edce3e155991702ad4b369362720259079df6fb /node-admin | |
parent | 3af3ef7791eca3e5db3f6d7c3952ac725cf0845c (diff) |
Moved log
Diffstat (limited to 'node-admin')
2 files changed, 14 insertions, 7 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 d5810f14ea2..d1f23b13e6c 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 @@ -68,7 +68,6 @@ public class NodeAdminStateUpdater { String dockerHostHostName, Clock clock, Duration nodeAdminConvergeStateInterval) { - log.log(LogLevel.INFO, objectToString() + ": Creating object"); this.nodeRepository = nodeRepository; this.orchestrator = orchestrator; this.storageMaintainer = storageMaintainer; @@ -79,10 +78,6 @@ public class NodeAdminStateUpdater { this.lastTick = clock.instant(); } - 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() { @@ -281,7 +276,6 @@ public class NodeAdminStateUpdater { if (!terminated.compareAndSet(false, true)) { throw new RuntimeException("Can not re-stop a node agent."); } - log.log(LogLevel.INFO, objectToString() + ": Stop called"); // First we need to stop NodeAdminStateUpdater thread to make sure no new NodeAgents are spawned signalWorkToBeDone(); @@ -297,6 +291,5 @@ public class NodeAdminStateUpdater { // Finally, stop NodeAdmin and all the NodeAgents nodeAdmin.stop(); - log.log(LogLevel.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 5d3e4cd3ec6..f93f089254d 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 @@ -5,6 +5,7 @@ import com.google.inject.Inject; import com.yahoo.concurrent.lock.Lock; import com.yahoo.concurrent.lock.Locking; import com.yahoo.container.di.componentgraph.Provider; +import com.yahoo.log.LogLevel; import com.yahoo.net.HostName; import com.yahoo.system.ProcessExecuter; @@ -29,6 +30,7 @@ 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; @@ -42,12 +44,15 @@ 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; private final Lock classLock; @Inject public NodeAdminProvider(Docker docker, MetricReceiverWrapper metricReceiver, Locking locking) { + log.log(LogLevel.INFO, objectToString() + ": Creating object, acquiring lock..."); classLock = locking.lock(this.getClass()); + log.log(LogLevel.INFO, objectToString() + ": Lock acquired"); Clock clock = Clock.systemUTC(); String dockerHostHostName = HostName.getLocalhost(); @@ -80,7 +85,16 @@ public class NodeAdminProvider implements Provider<NodeAdminStateUpdater> { @Override public void deconstruct() { + log.log(LogLevel.INFO, objectToString() + ": Stop called"); + nodeAdminStateUpdater.stop(); + log.log(LogLevel.INFO, objectToString() + ": Stop complete"); + classLock.close(); + log.log(LogLevel.INFO, objectToString() + ": Lock released"); + } + + private String objectToString() { + return this.getClass().getSimpleName() + "@" + Integer.toString(System.identityHashCode(this)); } } |