feat: cluster node list now includes advertise address (#551)

Signed-off-by: Li Zhanhui <lizhanhui@gmail.com>
AutoMQ · Nov 2, 2023 · 1e0bcb1 · 1e0bcb1
1 parent 107ce5c
commit 1e0bcb1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/cli/src/main/java/com/automq/rocketmq/cli/ConsoleHelper.java b/cli/src/main/java/com/automq/rocketmq/cli/ConsoleHelper.java
@@ -78,7 +78,7 @@ public static void printCluster(Cluster cluster) {
         AsciiTable nodeTable = new AsciiTable();
         nodeTable.addRule();
         row = nodeTable.addRow("NODE ID", "NODE NAME", "TOPIC QUANTITY", "QUEUE QUANTITY",
-            "STREAM QUANTITY", "LAST HEARTBEAT", "ROLE", "EPOCH", "EXPIRATION");
+            "STREAM QUANTITY", "LAST HEARTBEAT", "ROLE", "EPOCH", "EXPIRATION", "ADDRESS");
 
         alignCentral(row);
 
@@ -87,7 +87,7 @@ public static void printCluster(Cluster cluster) {
             boolean isLeader = node.getId() == cluster.getLease().getNodeId();
             row = nodeTable.addRow(node.getId(), node.getName(), node.getTopicNum(), node.getQueueNum(), node.getStreamNum(),
                 toDate(node.getLastHeartbeat()), isLeader ? "Leader" : "Worker", isLeader ? cluster.getLease().getEpoch() : "",
-                isLeader ? toDate(cluster.getLease().getExpirationTimestamp()) : "");
+                isLeader ? toDate(cluster.getLease().getExpirationTimestamp()) : "", node.getAddress());
             alignCentral(row);
         }
         nodeTable.addRule();

diff --git a/...oller/src/main/java/com/automq/rocketmq/controller/server/store/DefaultMetadataStore.java b/...oller/src/main/java/com/automq/rocketmq/controller/server/store/DefaultMetadataStore.java
@@ -240,6 +240,7 @@ public CompletableFuture<Cluster> describeCluster(DescribeClusterRequest request
                     .setQueueNum(topicManager.queueNumOfNode(entry.getKey()))
                     .setStreamNum(topicManager.streamNumOfNode(entry.getKey()))
                     .setGoingAway(brokerNode.isGoingAway())
+                    .setAddress(brokerNode.getNode().getAddress())
                     .build();
                 builder.addNodes(node);
             }

diff --git a/proto/src/main/proto/admin.proto b/proto/src/main/proto/admin.proto
@@ -37,6 +37,9 @@ message Node {
 
   // Timestamp that the leader receives heartbeat from this node
   google.protobuf.Timestamp last_heartbeat = 7;
+
+  // Advertise address
+  string address = 8;
 }
 
 message ClusterSummary {