cluster: fix service check (#2047)

pingcap · Sep 23, 2022 · 1a4714d · 1a4714d
1 parent 95b3061
commit 1a4714d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/pkg/cluster/operation/check.go b/pkg/cluster/operation/check.go
@@ -530,12 +530,12 @@ func CheckServices(ctx context.Context, e ctxt.Executor, host, service string, d
 
 	switch disable {
 	case false:
-		if !strings.Contains(active, "running") {
+		if active != "active" {
 			result.Err = fmt.Errorf("service %s is not running", service)
 			result.Msg = fmt.Sprintf("start %s.service", service)
 		}
 	case true:
-		if strings.Contains(active, "running") {
+		if active == "active" {
 			result.Err = fmt.Errorf("service %s is running but should be stopped", service)
 			result.Msg = fmt.Sprintf("stop %s.service", service)
 		}

diff --git a/pkg/cluster/operation/systemd.go b/pkg/cluster/operation/systemd.go
@@ -40,10 +40,9 @@ func GetServiceStatus(ctx context.Context, e ctxt.Executor, name string) (active
 		Action: "status",
 	}
 	systemd := module.NewSystemdModule(c)
-	stdout, _, err := systemd.Execute(ctx, e)
-	if err != nil {
-		return
-	}
+	// ignore error since stopped service returns exit code 3
+	stdout, _, _ := systemd.Execute(ctx, e)
+
 	lines := strings.Split(string(stdout), "\n")
 	for _, line := range lines {
 		words := strings.Split(strings.TrimSpace(line), " ")