Merge branch 'master' into fix_dm_peer_urls

pingcap · Jun 16, 2022 · c067a76 · c067a76
2 parents 967ebdb + 568324c
commit c067a76
Showing 1 changed file with 21 additions and 13 deletions.
diff --git a/pkg/cluster/manager/check.go b/pkg/cluster/manager/check.go
@@ -168,11 +168,12 @@ func checkSystemInfo(
 	opt *CheckOptions,
 ) error {
 	var (
-		collectTasks  []*task.StepDisplay
-		checkSysTasks []*task.StepDisplay
-		cleanTasks    []*task.StepDisplay
-		applyFixTasks []*task.StepDisplay
-		downloadTasks []*task.StepDisplay
+		collectTasks       []*task.StepDisplay
+		checkTimeZoneTasks []*task.StepDisplay
+		checkSysTasks      []*task.StepDisplay
+		cleanTasks         []*task.StepDisplay
+		applyFixTasks      []*task.StepDisplay
+		downloadTasks      []*task.StepDisplay
 	)
 	logger := ctx.Value(logprinter.ContextKeyLogger).(*logprinter.Logger)
 	insightVer := spec.TiDBComponentVersion(spec.ComponentCheckCollector, "")
@@ -317,28 +318,34 @@ func checkSystemInfo(
 					BuildAsStep(fmt.Sprintf("  - Getting system info of %s:%d", inst.GetHost(), inst.GetSSHPort()))
 				collectTasks = append(collectTasks, t2)
 
-				// build checking tasks
-				t1 = t1.
-					// check for general system info
+				t4 := task.NewBuilder(logger).
+					// check for time zone
 					CheckSys(
 						inst.GetHost(),
 						"",
-						task.CheckTypeSystemInfo,
+						task.CheckTypeTimeZone,
 						topo,
 						opt.Opr,
-					).
+					)
+				checkTimeZoneTasks = append(
+					checkTimeZoneTasks,
+					t4.BuildAsStep(fmt.Sprintf("  - Checking node %s", inst.GetHost())),
+				)
+
+				// build checking tasks
+				t1 = t1.
+					// check for general system info
 					CheckSys(
 						inst.GetHost(),
 						"",
-						task.CheckTypePartitions,
+						task.CheckTypeSystemInfo,
 						topo,
 						opt.Opr,
 					).
-					// check for time zone
 					CheckSys(
 						inst.GetHost(),
 						"",
-						task.CheckTypeTimeZone,
+						task.CheckTypePartitions,
 						topo,
 						opt.Opr,
 					).
@@ -440,6 +447,7 @@ func checkSystemInfo(
 	t := task.NewBuilder(logger).
 		ParallelStep("+ Download necessary tools", false, downloadTasks...).
 		ParallelStep("+ Collect basic system information", false, collectTasks...).
+		ParallelStep("+ Check time zone", false, checkTimeZoneTasks...).
 		ParallelStep("+ Check system requirements", false, checkSysTasks...).
 		ParallelStep("+ Cleanup check files", false, cleanTasks...).
 		Build()