PullRequest: 357 fix: bugs of sp_ipv6

oceanbase · Mar 3, 2025 · d96347f · d96347f
1 parent 4070e81
commit d96347f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/agent/executor/ob/scale_out.go b/agent/executor/ob/scale_out.go
@@ -1213,7 +1213,7 @@ func (t *AddServerTask) Execute() error {
 		return errors.New("get zone failed")
 	}
 
-	port, err := strconv.Atoi(configs[constant.CONFIG_MYSQL_PORT])
+	port, err := strconv.Atoi(configs[constant.CONFIG_RPC_PORT])
 	if err != nil {
 		return errors.Wrap(err, "convert port to integer failed")
 	}

diff --git a/agent/executor/ob/stop.go b/agent/executor/ob/stop.go
@@ -237,9 +237,13 @@ func (t *ExecStopSqlTask) stopServer() (err error) {
 	}
 	for _, server := range t.scope.Target {
 		t.ExecuteLogf("Stop %s", server)
-		serverInfo, err := meta.ConvertAddressToAgentInfo(server)
+		agentInfo, err := meta.ConvertAddressToAgentInfo(server)
+		if err != nil {
+			return errors.Errorf("convert server '%s' to agent info failed: %v", server, err)
+		}
 		for _, agent := range agents {
-			if serverInfo.Ip == agent.Ip && serverInfo.Port == agent.Port {
+			if agentInfo.Ip == agent.Ip && agentInfo.Port == agent.Port {
+				serverInfo := meta.NewAgentInfo(agent.Ip, agent.RpcPort)
 				sql := fmt.Sprintf("alter system stop server '%s'", serverInfo.String())
 				log.Info(sql)
 				if err = obclusterService.ExecuteSql(sql); err != nil {