From 1355bc162bbf4de46a3b45709701977714fa8758 Mon Sep 17 00:00:00 2001
From: leo65535 <leo65535@163.com>
Date: Thu, 19 May 2022 23:45:53 +0800
Subject: [PATCH] [Enhance] Add host info to heartbeat error msg (#9499)

---
 .../org/apache/doris/system/BackendHbResponse.java     | 10 ++++++++++
 .../java/org/apache/doris/system/HeartbeatMgr.java     |  4 ++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/fe/fe-core/src/main/java/org/apache/doris/system/BackendHbResponse.java b/fe/fe-core/src/main/java/org/apache/doris/system/BackendHbResponse.java
index cd93dd1cfcbdce..c7538a533f306e 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/system/BackendHbResponse.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/system/BackendHbResponse.java
@@ -32,6 +32,7 @@ public class BackendHbResponse extends HeartbeatResponse implements Writable {
     private int httpPort;
     private int brpcPort;
     private long beStartTime;
+    private String host;
     private String version = "";
 
     public BackendHbResponse() {
@@ -57,6 +58,14 @@ public BackendHbResponse(long beId, String errMsg) {
         this.msg = errMsg;
     }
 
+    public BackendHbResponse(long beId, String host, String errMsg) {
+        super(HeartbeatResponse.Type.BACKEND);
+        this.status = HbStatus.BAD;
+        this.beId = beId;
+        this.host = host;
+        this.msg = errMsg;
+    }
+
     public long getBeId() {
         return beId;
     }
@@ -110,6 +119,7 @@ public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append(super.toString());
         sb.append(", beId: ").append(beId);
+        sb.append(", beHost: ").append(host);
         sb.append(", bePort: ").append(bePort);
         sb.append(", httpPort: ").append(httpPort);
         sb.append(", brpcPort: ").append(brpcPort);
diff --git a/fe/fe-core/src/main/java/org/apache/doris/system/HeartbeatMgr.java b/fe/fe-core/src/main/java/org/apache/doris/system/HeartbeatMgr.java
index d7fdaba7cd6d50..8026f14d9642c3 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/system/HeartbeatMgr.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/system/HeartbeatMgr.java
@@ -252,12 +252,12 @@ public HeartbeatResponse call() {
                     // backend.updateOnce(bePort, httpPort, beRpcPort, brpcPort);
                     return new BackendHbResponse(backendId, bePort, httpPort, brpcPort, System.currentTimeMillis(), beStartTime, version);
                 } else {
-                    return new BackendHbResponse(backendId, result.getStatus().getErrorMsgs().isEmpty() ? "Unknown error"
+                    return new BackendHbResponse(backendId, backend.getHost(), result.getStatus().getErrorMsgs().isEmpty() ? "Unknown error"
                             : result.getStatus().getErrorMsgs().get(0));
                 }
             } catch (Exception e) {
                 LOG.warn("backend heartbeat got exception", e);
-                return new BackendHbResponse(backendId,
+                return new BackendHbResponse(backendId, backend.getHost(),
                         Strings.isNullOrEmpty(e.getMessage()) ? "got exception" : e.getMessage());
             } finally {
                 if (client != null) {