From ec4d24bb150e3000125d234a25f8e4989b2e1934 Mon Sep 17 00:00:00 2001 From: shenzhengntu <503699317@qq.com> Date: Thu, 2 Nov 2023 16:35:15 +0800 Subject: [PATCH] he3cli check MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Code Source From: Self Code Description: [Optional] Jira: #[Optional] 市场项目编号（名称）：[Optional] --- he3cli/cmd/delete.go | 8 +++++++- he3cli/cmd/install_replica.go | 6 ++++++ he3cli/cmd/join_replica.go | 6 +++++- he3cli/cmd/switchover.go | 6 +++++- he3cli/pkg/operapi/operapi.go | 11 ++--------- 5 files changed, 25 insertions(+), 12 deletions(-) diff --git a/he3cli/cmd/delete.go b/he3cli/cmd/delete.go index baadf5ff..8704b730 100644 --- a/he3cli/cmd/delete.go +++ b/he3cli/cmd/delete.go @@ -39,6 +39,7 @@ func runDeleteReplica(cmd *cobra.Command, args []string) { sshPassword := vp.GetString("he3_private_conf.ssh_password") replicaBin := vp.GetString("he3_private_conf.he3db_bin") replicaHost, _ := cmd.Flags().GetString("host") + replicaPort, _ := cmd.Flags().GetString("port") replicaPath, _ := cmd.Flags().GetString("path") stopStr := replicaBin + "/pg_ctl stop -D " + replicaPath + " && " + @@ -50,7 +51,11 @@ func runDeleteReplica(cmd *cobra.Command, args []string) { fmt.Println("exec command failed: " + stopStr + err1.Error()) return } - + err := common.DelSlaveInstanceConf (replicaHost, replicaPort, vp) + if err != nil { + fmt.Println("DelSlaveInstanceConf failed " + err.Error()) + return + } fmt.Println("he3cli delete node done.") } } @@ -67,5 +72,6 @@ func init() { if !conf.EtcdFlag { deleteCmd.Flags().String("host", "127.0.0.1", "replica node host") deleteCmd.Flags().StringP("path", "D", "/home/postgres/he3data/replica", "replica database instance path") + deleteCmd.Flags().String("port", "5433", "replica node port") } } diff --git a/he3cli/cmd/install_replica.go b/he3cli/cmd/install_replica.go index 86cbc75e..ddd74440 100644 --- a/he3cli/cmd/install_replica.go +++ b/he3cli/cmd/install_replica.go @@ -94,6 +94,12 @@ func privateInstallReplica(cmd *cobra.Command) { return } + err := common.AddSlaveInstanceConf(replicaHost, replicaPort, vp) + if err != nil { + fmt.Println("AddSlaveInstanceConf failed " + err.Error()) + return + } + fmt.Println("he3cli install replica done.") } diff --git a/he3cli/cmd/join_replica.go b/he3cli/cmd/join_replica.go index d8083695..01139fd4 100644 --- a/he3cli/cmd/join_replica.go +++ b/he3cli/cmd/join_replica.go @@ -91,7 +91,11 @@ func runJoinReplica(cmd *cobra.Command, args []string) { fmt.Println("exec command failed: " + startStr + err3.Error()) return } - + err := common.AddSlaveInstanceConf(replicaHost, replicaPort, vp) + if err != nil { + fmt.Println("AddSlaveInstanceConf failed " + err.Error()) + return + } fmt.Println("he3cli join replica done.") } } diff --git a/he3cli/cmd/switchover.go b/he3cli/cmd/switchover.go index 2e306af4..ec8a1b75 100644 --- a/he3cli/cmd/switchover.go +++ b/he3cli/cmd/switchover.go @@ -121,7 +121,11 @@ func runSwitchover(cmd *cobra.Command, args []string) { fmt.Println("update config.yml for new primary failed: " + err.Error()) return } - + err := common.SwitchMasterInstanceConf(replicaHost,replicaPort,vp) + if err!= nil { + fmt.Println("SwitchMasterInstanceConf failed:" + err.Error()) + return + } fmt.Println("he3cli switchover done.") } } diff --git a/he3cli/pkg/operapi/operapi.go b/he3cli/pkg/operapi/operapi.go index 2867bcb9..bb4b23ea 100644 --- a/he3cli/pkg/operapi/operapi.go +++ b/he3cli/pkg/operapi/operapi.go @@ -830,8 +830,7 @@ func CheckAllPrivateInstance(cmd *cobra.Command) error { slaveListAddr := vp.GetString("he3_private_conf.slave_list_addr") sshUser := vp.GetString("he3_private_conf.ssh_user") sshPasswd := vp.GetString("he3_private_conf.ssh_password") - he3bin := vp.GetString("he3_private_conf.primary_bin") - replbin := vp.GetString("he3_private_conf.replica_bin") + he3bin := vp.GetString("he3_private_conf.he3db_bin") var primaryAddr string if len(primaryHost) != 0 && len(primaryPort) != 0 { primaryAddr = primaryHost + ":" + primaryPort @@ -878,13 +877,7 @@ func CheckAllPrivateInstance(cmd *cobra.Command) error { } } for i:=0;i