diff --git a/he3cli/cmd/delete.go b/he3cli/cmd/delete.go index baadf5ff499c2da0d6bd259b2b8ece4fcf3cdd58..8704b730ad8ecbb91a516c0e6787a0d4af7f1287 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 86cbc75e147b37b419afba7262560fa1d23cfc19..ddd74440af06dc3f00f782cc26d5e50e18c336ac 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 d8083695cacdb9e831166faa71fc0544a42f215e..01139fd4a7f2763cae8bfa4edb9ce98d171d3472 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 2e306af47f031d258c243128622e52d346b36ca2..ec8a1b75e791a7ac48c970b60ab276678113324a 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 2867bcb93839704ad6a3b1b8524ba74441b5c5b9..bb4b23eaa2e470aa2cbc7dcf739fab867fd19f32 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