Add hostname to resource exhaustion description

Hostname is inferred from the node's RPC address

3 files changed, 26 insertions, 8 deletions

diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetController.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetController.java
index 6dc4b1e8015..b3151916a90 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetController.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetController.java
@@ -350,7 +350,7 @@ public class FleetController implements NodeStateOrHostInfoChangeHandler, NodeAd
         var calc = createResourceExhaustionCalculator();
         // Important: nodeInfo contains the _current_ host info _prior_ to newHostInfo being applied.
         boolean previouslyExhausted = !calc.enumerateNodeResourceExhaustions(nodeInfo).isEmpty();
-        boolean nowExhausted        = !calc.resourceExhaustionsFromHostInfo(nodeInfo.getNode(), newHostInfo).isEmpty();
+        boolean nowExhausted        = !calc.resourceExhaustionsFromHostInfo(nodeInfo, newHostInfo).isEmpty();
         if (previouslyExhausted != nowExhausted) {
             log.fine(() -> String.format("Triggering state recomputation due to change in cluster feed block: %s -> %s",
                                          previouslyExhausted, nowExhausted));
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/NodeResourceExhaustion.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/NodeResourceExhaustion.java
index 609fea2b91e..79f04627073 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/NodeResourceExhaustion.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/NodeResourceExhaustion.java
@@ -15,13 +15,16 @@ public class NodeResourceExhaustion {
     public final String resourceType;
     public final ResourceUsage resourceUsage;
     public final double limit;
+    public final String rpcAddress;
 
     public NodeResourceExhaustion(Node node, String resourceType,
-                                  ResourceUsage resourceUsage, double limit) {
+                                  ResourceUsage resourceUsage, double limit,
+                                  String rpcAddress) {
         this.node = node;
         this.resourceType = resourceType;
         this.resourceUsage = resourceUsage;
         this.limit = limit;
+        this.rpcAddress = rpcAddress;
     }
 
     @Override
@@ -32,11 +35,12 @@ public class NodeResourceExhaustion {
         return Double.compare(that.limit, limit) == 0 &&
                 Objects.equals(node, that.node) &&
                 Objects.equals(resourceType, that.resourceType) &&
-                Objects.equals(resourceUsage, that.resourceUsage);
+                Objects.equals(resourceUsage, that.resourceUsage) &&
+                Objects.equals(rpcAddress, that.rpcAddress);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(node, resourceType, resourceUsage, limit);
+        return Objects.hash(node, resourceType, resourceUsage, limit, rpcAddress);
     }
 }
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ResourceExhaustionCalculator.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ResourceExhaustionCalculator.java
index c91c5dbeb8d..21f8d6a1f2d 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ResourceExhaustionCalculator.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ResourceExhaustionCalculator.java
@@ -1,6 +1,7 @@
 // Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.clustercontroller.core;
 
+import com.yahoo.jrt.Spec;
 import com.yahoo.vdslib.state.Node;
 import com.yahoo.vespa.clustercontroller.core.hostinfo.HostInfo;
 
@@ -46,14 +47,26 @@ public class ResourceExhaustionCalculator {
     }
 
     private static String formatNodeResourceExhaustion(NodeResourceExhaustion n) {
-        return String.format("%s%s on node %s (%.3g > %.3g)",
+        return String.format("%s%s on node %d [%s] (%.3g > %.3g)",
                              n.resourceType,
                              (n.resourceUsage.getName() != null ? ":" + n.resourceUsage.getName() : ""),
                              n.node.getIndex(),
+                             inferHostnameFromRpcAddress(n.rpcAddress),
                              n.resourceUsage.getUsage(), n.limit);
     }
 
-    public List<NodeResourceExhaustion> resourceExhaustionsFromHostInfo(Node node, HostInfo hostInfo) {
+    private static String inferHostnameFromRpcAddress(String rpcAddress) {
+        if (rpcAddress == null) {
+            return "unknown hostname";
+        }
+        var spec = new Spec(rpcAddress);
+        if (spec.malformed()) {
+            return "unknown hostname";
+        }
+        return spec.host();
+    }
+
+    public List<NodeResourceExhaustion> resourceExhaustionsFromHostInfo(NodeInfo nodeInfo, HostInfo hostInfo) {
         List<NodeResourceExhaustion> exceedingLimit = null;
         for (var usage : hostInfo.getContentNode().getResourceUsage().entrySet()) {
             double limit = feedBlockLimits.getOrDefault(usage.getKey(), 1.0);
@@ -61,7 +74,8 @@ public class ResourceExhaustionCalculator {
                 if (exceedingLimit == null) {
                     exceedingLimit = new ArrayList<>();
                 }
-                exceedingLimit.add(new NodeResourceExhaustion(node, usage.getKey(), usage.getValue(), limit));
+                exceedingLimit.add(new NodeResourceExhaustion(nodeInfo.getNode(), usage.getKey(), usage.getValue(),
+                                                              limit, nodeInfo.getRpcAddress()));
             }
         }
         return (exceedingLimit != null) ? exceedingLimit : Collections.emptyList();
@@ -71,7 +85,7 @@ public class ResourceExhaustionCalculator {
         if (!nodeInfo.isStorage()) {
             return Collections.emptyList();
         }
-        return resourceExhaustionsFromHostInfo(nodeInfo.getNode(), nodeInfo.getHostInfo());
+        return resourceExhaustionsFromHostInfo(nodeInfo, nodeInfo.getHostInfo());
     }
 
     // Returns 0-n entries per content node in the cluster, where n is the number of exhausted