diff --git a/src/go/pt-k8s-pxc-recovery/helpers/helpers.go b/src/go/pt-k8s-pxc-recovery/helpers/helpers.go index 3d51c463..64aa0d19 100644 --- a/src/go/pt-k8s-pxc-recovery/helpers/helpers.go +++ b/src/go/pt-k8s-pxc-recovery/helpers/helpers.go @@ -3,7 +3,6 @@ package helpers import ( "errors" "fmt" - "os" "os/exec" "runtime" ) @@ -28,7 +27,6 @@ func SetNamespace(name string) { func RunCmd(args ...string) (string, error) { args = append([]string{"-v=0", "--namespace", namespace}, args...) cmd := exec.Command(getKubectl(), args...) - cmd.Env = os.Environ() println(cmd.String()) stdouterr, err := cmd.CombinedOutput() if err != nil { diff --git a/src/go/pt-k8s-pxc-recovery/recover/recover.go b/src/go/pt-k8s-pxc-recovery/recover/recover.go index 4acf7c55..c84004e8 100644 --- a/src/go/pt-k8s-pxc-recovery/recover/recover.go +++ b/src/go/pt-k8s-pxc-recovery/recover/recover.go @@ -66,9 +66,6 @@ func ConfirmCrashedStatus() error { if err != nil { return err } - if len(podNames) > 1 { - return errors.New("Cluster has more than one Pod up") - } failedNodes := 0 for _, pod := range podNames { logs, err := helpers.RunCmd("logs", pod) @@ -91,7 +88,7 @@ func PatchClusterImage() error { "pxc", clusterName, "--type=merge", - `--patch='{"spec":{"pxc":{"image":"percona/percona-xtradb-cluster-operator:1.4.0-pxc8.0-debug"}}}'`, + `--patch={"spec":{"pxc":{"image":"percona/percona-xtradb-cluster-operator:1.4.0-pxc8.0-debug"}}}`, } _, err := helpers.RunCmd(args...) if err != nil { @@ -109,10 +106,7 @@ func RestartPods() error { "--force", "--grace-period=0", } - _, err := helpers.RunCmd(args...) - if err != nil { - return err - } + helpers.RunCmd(args...) } return nil } @@ -128,7 +122,7 @@ func CheckPodStatus(podID int) (bool, error) { if err != nil { return false, err } - if output == "true" { + if strings.Trim(output, "'") == "true" { return true, nil } return false, nil @@ -158,7 +152,7 @@ func CheckPodPhase(podID int, phase string) (bool, error) { if err != nil { return false, err } - if output == phase { + if strings.Trim(output, "'") == phase { return true, nil } return false, nil @@ -167,13 +161,9 @@ func CheckPodPhase(podID int, phase string) (bool, error) { func AllPodsRunning() error { for i := 0; i < clusterSize; i++ { running := false - var err error for running == false { time.Sleep(time.Second * 10) - running, err = CheckPodPhase(i, "Running") - if err != nil { - return err - } + running, _ = CheckPodPhase(i, "Running") } } return nil