Merge pull request #832 from signal18/task-log

display process when reseed using mysqldump backup
signal18 · Sep 4, 2024 · dc41788 · dc41788
2 parents d2236a0 + bcfeecc
commit dc41788
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/cluster/srv_job.go b/cluster/srv_job.go
@@ -1068,10 +1068,11 @@ func (server *ServerMonitor) JobReseedMysqldump(backupfile string) error {
 		return fmt.Errorf("[%s] Error happened when unzipping backup file in backup server for reseed:  %s ", server.URL, err)
 	}
 
-	clientCmd := exec.Command(cluster.GetMysqlclientPath(), `--defaults-file=`+file, `--host=`+misc.Unbracket(server.Host), `--port=`+server.Port, `--user=`+cluster.GetDbUser(), `--force`, `--batch` /*, `--init-command=reset master;set sql_log_bin=0;set global slow_query_log=0;set global general_log=0;`*/)
+	clientCmd := exec.Command(cluster.GetMysqlclientPath(), `--defaults-file=`+file, `--host=`+misc.Unbracket(server.Host), `--port=`+server.Port, `--user=`+cluster.GetDbUser(), `--force`, `--batch`, `--verbose` /*, `--init-command=reset master;set sql_log_bin=0;set global slow_query_log=0;set global general_log=0;`*/)
 	clientCmd.Stdin = io.MultiReader(bytes.NewBufferString("reset master;set sql_log_bin=0;"), &buf)
 
-	stderr, _ := clientCmd.StderrPipe()
+	stderr, _ := clientCmd.StdoutPipe()
+	clientCmd.Stderr = clientCmd.Stdout
 
 	if err := clientCmd.Start(); err != nil {
 		return fmt.Errorf("Can't start mysql client:%s at %s", err, strings.ReplaceAll(clientCmd.String(), cluster.GetDbPass(), "XXXX"))