main node port in genOrGetKey

Author: ActivePeter

app/job_ssh.go

@@ -8,6 +8,7 @@ import (
 	"os"
 	"path/filepath"
 	"regexp"
+	"strconv"
 	"strings"
 	"telego/util"
 	clusterconf "telego/util/cluster_conf"
@@ -291,14 +292,22 @@ func (m ModJobSshStruct) genOrGetKey() {
 			fmt.Println("User canceled config ssh no pw access")
 			os.Exit(1)
 		}
+
+		mainNodePort, err := strconv.Atoi(util.MainNodeSshPort)
+		if err != nil {
+			fmt.Println(color.RedString("failed to convert main node ssh port to int: %v", err))
+			os.Exit(1)
+		}
+
 		m.setupClusterInner(clusterconf.ClusterConfYmlModel{
 			Global: clusterconf.ClusterConfYmlModelGlobal{
 				SshUser:   util.MainNodeUser,
 				SshPasswd: password,
 			},
 			Nodes: map[string]clusterconf.ClusterConfYmlModelNode{
 				"dummy": {
-					Ip: util.MainNodeIp,
+					Ip:   util.MainNodeIp,
+					Port: mainNodePort,
 				},
 			},
 		})
@@ -310,6 +319,9 @@ func (m ModJobSshStruct) setupClusterInner(clusterConf clusterconf.ClusterConfYm
 	fmt.Printf("集群配置: %+v\n", clusterConf)
 
 	hosts := funk.Map(clusterConf.Nodes, func(_ string, node clusterconf.ClusterConfYmlModelNode) string {
+		if node.Port != 0 {
+			return fmt.Sprintf("%s@%s:%d", clusterConf.Global.SshUser, node.Ip, node.Port)
+		}
 		return fmt.Sprintf("%s@%s", clusterConf.Global.SshUser, node.Ip)
 	}).([]string)
 
@@ -322,30 +334,31 @@ func (m ModJobSshStruct) setupClusterInner(clusterConf clusterconf.ClusterConfYm
 	}
 	_ = base64.StdEncoding.EncodeToString(pubkeybytes)
 
-	output, logfps := util.StartRemoteCmds(
+	// output, logfps :=
+	util.StartRemoteCmds(
 		hosts,
-		// install telego,
-		util.ModRunCmd.CmdModels().InstallTelegoWithPy()+"; "+
+
+		util.ModRunCmd.CmdModels().InstallTelegoWithPy()+" && "+
 			// update authorized_keys
 			strings.Join(m.NewSshCmd(SshJob{Mode: SshModeSetupThisNode}.ModeString()), " "),
 		clusterConf.Global.SshPasswd,
 	)
-	logfdebug, err := os.ReadFile(logfps[0] + ".debug")
-	if err != nil {
-		fmt.Println(color.RedString("read logfdebug failed: %v", err))
-		os.Exit(1)
-	}
-	srcs := []string{output[0], string(logfdebug)}
-	keywords := []string{"error", "失败"}
-	if funk.Any(srcs, func(src string) bool {
-		return funk.Any(keywords, func(keyword string) bool {
-			return strings.Contains(src, keyword)
-		})
-	}) {
-		fmt.Println(color.RedString("ssh error: %s", output))
-		// debug sshd_config
-		util.ModRunCmd.NewBuilder("cat", "/etc/ssh/sshd_config").WithRoot().ShowProgress().BlockRun()
-	}
+	// logfdebug, err := os.ReadFile(logfps[0] + ".debug")
+	// if err != nil {
+	// 	fmt.Println(color.RedString("read logfdebug failed: %v", err))
+	// 	os.Exit(1)
+	// }
+	// srcs := []string{output[0], string(logfdebug)}
+	// keywords := []string{"error", "失败"}
+	// if funk.Any(srcs, func(src string) bool {
+	// 	return funk.Any(keywords, func(keyword string) bool {
+	// 		return strings.Contains(src, keyword)
+	// 	})
+	// }) {
+	// 	fmt.Println(color.RedString("ssh error: %s", output))
+	// 	// debug sshd_config
+	// 	util.ModRunCmd.NewBuilder("cat", "/etc/ssh/sshd_config").WithRoot().ShowProgress().BlockRun()
+	// }
 }
 
 // https://qcnoe3hd7k5c.feishu.cn/wiki/V6eHwZm1aiofeykaSd5cmgPcnSe#share-Hc1hdGT26oI4I0xPaplcEhMundd

test/test3_main_node_config/config_test.go

@@ -3,6 +3,7 @@ package test3_main_node_config
 import (
 	"os/exec"
 	"path"
+	"path/filepath"
 	"telego/test/testutil"
 	"telego/util"
 	"testing"
@@ -59,6 +60,13 @@ func TestSSHKeyGeneration(t *testing.T) {
 		t.Fatalf("初始化main node file server失败: %v", err)
 	}
 
+	// upload telego
+	t.Logf("upload telego to main node")
+	_, err = util.ModRunCmd.NewBuilder("python3", filepath.Join(projectRoot, "3.upload.py")).ShowProgress().BlockRun()
+	if err != nil {
+		t.Fatalf("上传telego到 main node 失败: %v", err)
+	}
+
 	t.Logf("telego log for start main node file server:\n %s", testutil.GetMostRecentLog(t))
 
 	// 重新生成 SSH 密钥

test/testutil/docker.go

@@ -52,7 +52,7 @@ func RunSSHDocker(t *testing.T) (string, func()) {
 
 	// 拉取并运行构建镜像，映射项目目录
 	cmd := exec.Command("docker", "run", "-d",
-		"-p", "2222:22", // for test main node ssh
+		"-p", "2222:2222", // for test main node ssh
 		"-p", "8003:8003", // for test fileserver
 		"-v", hostProjectPath+":/telego",
 		"telego_build",
@@ -103,7 +103,8 @@ func RunSSHDocker(t *testing.T) (string, func()) {
 	// 配置SSH服务器和创建用户
 	t.Log("RunSSHDocker 配置SSH服务器和创建用户")
 	configSSHCmd := exec.Command("docker", "exec", containerID, "bash", "-c",
-		"echo 'PermitRootLogin yes' >> /etc/ssh/sshd_config && "+
+		"echo 'Port 2222' >> /etc/ssh/sshd_config && "+
+			"echo 'PermitRootLogin yes' >> /etc/ssh/sshd_config && "+
 			"echo 'root:password' | chpasswd && "+
 			"useradd -m -s /bin/bash abc && "+
 			"echo 'abc:abc' | chpasswd && "+

util/cluster_conf/lib.go

@@ -10,6 +10,7 @@ type ClusterConfYmlModelGlobal struct {
 
 type ClusterConfYmlModelNode struct {
 	Ip   string   `yaml:"ip"`
+	Port int      `yaml:"port,omitempty"`
 	Tags []string `yaml:"tags,omitempty"`
 }