a

main.go

@@ -350,7 +350,7 @@ func waitRestoreFinish(lightningIPs []string, deployDir, pattern string) (err er
 		}()
 		go func() {
 			defer wg.Done()
-			if _, err = runCmdAndGetStdOutInTimeAndMatchPattern(stdOutMsg, pattern, "ssh", ip, fmt.Sprintf(`tail -f %s/log/tidb_lightning.log | sed '/^%s$/ q'`, deployDir, pattern)); err != nil {
+			if _, err = runCmdAndGetStdOutInTimeAndMatchPattern(stdOutMsg, pattern, "ssh", ip, fmt.Sprintf(`tail -f %s/log/tidb_lightning.log`, deployDir)); err != nil {
 				if err != nil {
 					errCh <- err
 					return
@@ -467,6 +467,7 @@ func runCmdAndGetStdOutInTimeAndMatchPattern(stdOutMsg chan string, pattern, nam
 		fmt.Println(err)
 		return
 	}
+	var match bool
 	reader := bufio.NewReader(stdout)
 	var line string
 	for {
@@ -480,13 +481,19 @@ func runCmdAndGetStdOutInTimeAndMatchPattern(stdOutMsg chan string, pattern, nam
 		}
 		stdOutMsg <- line
 		if strings.Contains(line, pattern) {
+			match = true
 			break
 		}
 	}
 	stdErrBytes, err = ioutil.ReadAll(stderr)
 	if err != nil {
 		return
 	}
+	if match {
+		go func() {
+			cmd.Process.Kill()
+		}()
+	}
 	if err = cmd.Wait(); err != nil {
 		fmt.Printf("%s", stdErrBytes)
 	}