cluster:fix info when restore meta (#1910)

pingcap · Jun 8, 2022 · 4053c62 · 4053c62
1 parent 76f65ea
commit 4053c62
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/components/dm/command/root.go b/components/dm/command/root.go
@@ -127,7 +127,7 @@ please backup your data before process.`,
 	tui.BeautifyCobraUsageAndHelp(rootCmd)
 
 	rootCmd.PersistentFlags().Uint64Var(&gOpt.SSHTimeout, "ssh-timeout", 5, "Timeout in seconds to connect host via SSH, ignored for operations that don't need an SSH connection.")
-	rootCmd.PersistentFlags().Uint64Var(&gOpt.OptTimeout, "wait-timeout", 60, "Timeout in seconds to wait for an operation to complete, ignored for operations that don't fit.")
+	rootCmd.PersistentFlags().Uint64Var(&gOpt.OptTimeout, "wait-timeout", 120, "Timeout in seconds to wait for an operation to complete, ignored for operations that don't fit.")
 	rootCmd.PersistentFlags().BoolVarP(&skipConfirm, "yes", "y", false, "Skip all confirmations and assumes 'yes'")
 	rootCmd.PersistentFlags().BoolVar(&gOpt.NativeSSH, "native-ssh", gOpt.NativeSSH, "Use the SSH client installed on local system instead of the build-in one.")
 	rootCmd.PersistentFlags().StringVar((*string)(&gOpt.SSHType), "ssh", "", "The executor type: 'builtin', 'system', 'none'")

diff --git a/pkg/cluster/manager/basic.go b/pkg/cluster/manager/basic.go
@@ -367,7 +367,7 @@ func (m *Manager) RestoreClusterMeta(clusterName, filePath string, skipConfirm b
 		); err != nil {
 			return err
 		}
-		m.logger.Infof("Destroying cluster...")
+		m.logger.Infof("Restoring cluster meta files...")
 	}
 	err = os.RemoveAll(m.specManager.Path(clusterName))
 	if err != nil {