Merge pull request #2038 from yahoo/freva/add-docker-metrics-debug

Add debug logging for docker metrics reporting

1 files changed, 10 insertions, 2 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 aa6f762543f..60987501d4b 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
@@ -508,14 +508,21 @@ public class NodeAgentImpl implements NodeAgent {
 
     @SuppressWarnings("unchecked")
     public void updateContainerNodeMetrics(int numAllocatedContainersOnHost) {
+        logger.debug("Gathering metrics");
         ContainerNodeSpec nodeSpec;
         synchronized (monitor) {
             nodeSpec = lastNodeSpec;
         }
 
-        if (nodeSpec == null || !vespaVersion.isPresent()) return;
+        if (nodeSpec == null || !vespaVersion.isPresent()) {
+            logger.debug("Not updating container metrics, nodeSpec=" + nodeSpec + ", vespaVersion=" + vespaVersion);
+            return;
+        }
         Optional<Docker.ContainerStats> containerStats = dockerOperations.getContainerStats(containerName);
-        if ( ! containerStats.isPresent()) return;
+        if ( ! containerStats.isPresent()) {
+            logger.debug("Failed to get docker stats from daemon");
+            return;
+        }
 
         Docker.ContainerStats stats = containerStats.get();
         Dimensions.Builder dimensionsBuilder = new Dimensions.Builder()
@@ -551,6 +558,7 @@ public class NodeAgentImpl implements NodeAgent {
         double cpuPercentageOfHost = lastCpuMetric.getCpuUsagePercentage(currentCpuContainerTotalTime, currentCpuSystemTotalTime);
         double cpuPercentageOfAllocated = numAllocatedContainersOnHost * cpuPercentageOfHost;
         metricReceiver.declareGauge(MetricReceiverWrapper.APPLICATION_DOCKER, dimensions, "node.cpu.busy.pct").sample(cpuPercentageOfAllocated);
+        logger.debug("Updated CPU busy metric with: " + cpuPercentageOfAllocated);
 
         addIfNotNull(dimensions, "node.cpu.throttled_time", stats.getCpuStats().get("throttling_data"), "throttled_time");
         addIfNotNull(dimensions, "node.memory.limit", stats.getMemoryStats(), "limit");