From 6751d75cae844f75ff100fae6e8320182088a8b2 Mon Sep 17 00:00:00 2001
From: huayucai <15210962647@163.com>
Date: Tue, 27 Jun 2023 09:47:08 +0800
Subject: [PATCH] support ipv6

---
 frontend/src/routes/cluster/cluster.utils.ts          |  2 +-
 .../control/manager/ResourceNodeAndAgentManager.java  |  3 +++
 .../main/java/org/apache/doris/stack/shell/SCP.java   |  6 +++++-
 .../apache/doris/stack/entity/ClusterInfoEntity.java  | 11 +++++++++++
 4 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/frontend/src/routes/cluster/cluster.utils.ts b/frontend/src/routes/cluster/cluster.utils.ts
index 522dbf7..3a6b693 100644
--- a/frontend/src/routes/cluster/cluster.utils.ts
+++ b/frontend/src/routes/cluster/cluster.utils.ts
@@ -17,6 +17,6 @@
 
 export function transformHostToIp(host: string) {
     if (!host.includes(':')) return host;
-    const sliceIndex = host.indexOf(':');
+    const sliceIndex = host.lastIndexOf(':');
     return host.slice(0, sliceIndex);
 }
diff --git a/manager/dm-server/src/main/java/org/apache/doris/stack/control/manager/ResourceNodeAndAgentManager.java b/manager/dm-server/src/main/java/org/apache/doris/stack/control/manager/ResourceNodeAndAgentManager.java
index 502ef2f..d2994f3 100644
--- a/manager/dm-server/src/main/java/org/apache/doris/stack/control/manager/ResourceNodeAndAgentManager.java
+++ b/manager/dm-server/src/main/java/org/apache/doris/stack/control/manager/ResourceNodeAndAgentManager.java
@@ -487,6 +487,9 @@ private String getServerAddr() {
         if (host == null || host.isEmpty()) {
             try {
                 host = InetAddress.getLocalHost().getHostAddress();
+                if (host.split(":").length > 2) {
+                    host = '[' + host + ']';
+                }
             } catch (UnknownHostException e) {
                 throw new ServerException("get server ip fail");
             }
diff --git a/manager/dm-server/src/main/java/org/apache/doris/stack/shell/SCP.java b/manager/dm-server/src/main/java/org/apache/doris/stack/shell/SCP.java
index b266ce4..db28635 100644
--- a/manager/dm-server/src/main/java/org/apache/doris/stack/shell/SCP.java
+++ b/manager/dm-server/src/main/java/org/apache/doris/stack/shell/SCP.java
@@ -33,7 +33,11 @@ public SCP(String user, int sshPort, String sshKeyFile, String host, String loca
         this.user = user;
         this.sshPort = sshPort;
         this.sshKeyFile = sshKeyFile;
-        this.host = host;
+        if (host != null && host.split(":").length > 2) {
+            this.host = '[' + host + ']';
+        } else {
+            this.host = host;
+        }
         this.localPath = localPath;
         this.remotePath = remotePath;
     }
diff --git a/manager/resource-common/src/main/java/org/apache/doris/stack/entity/ClusterInfoEntity.java b/manager/resource-common/src/main/java/org/apache/doris/stack/entity/ClusterInfoEntity.java
index 42484e2..0e7624d 100644
--- a/manager/resource-common/src/main/java/org/apache/doris/stack/entity/ClusterInfoEntity.java
+++ b/manager/resource-common/src/main/java/org/apache/doris/stack/entity/ClusterInfoEntity.java
@@ -63,6 +63,17 @@ public class ClusterInfoEntity {
 
     private String address;
 
+    public String getAddress() {
+        if (address != null && address.split(":").length > 2) {
+            return '[' + address + ']';
+        }
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
     private int httpPort;
 
     private int queryPort;