Remove useless errors.AddStack (#985)

Fix #721

components/cluster/command/check.go

@@ -65,7 +65,7 @@ conflict checks with other clusters`,
 
 				exist, err := tidbSpec.Exist(clusterName)
 				if err != nil {
-					return perrs.AddStack(err)
+					return err
 				}
 
 				if !exist {

components/cluster/command/display.go

@@ -47,7 +47,7 @@ func newDisplayCmd() *cobra.Command {
 
 			exist, err := tidbSpec.Exist(clusterName)
 			if err != nil {
-				return perrs.AddStack(err)
+				return err
 			}
 
 			if !exist {
@@ -57,12 +57,12 @@ func newDisplayCmd() *cobra.Command {
 			metadata, err := spec.ClusterMetadata(clusterName)
 			if err != nil && !errors.Is(perrs.Cause(err), meta.ErrValidate) &&
 				!errors.Is(perrs.Cause(err), spec.ErrNoTiSparkMaster) {
-				return perrs.AddStack(err)
+				return err
 			}
 			if showDashboardOnly {
 				tlsCfg, err := metadata.Topology.TLSConfig(tidbSpec.Path(clusterName, spec.TLSCertKeyDir))
 				if err != nil {
-					return perrs.AddStack(err)
+					return err
 				}
 				return displayDashboardInfo(clusterName, tlsCfg)
 			}

components/cluster/command/import.go

@@ -19,7 +19,6 @@ import (
 	"path/filepath"
 
 	"github.com/fatih/color"
-	"github.com/pingcap/errors"
 	"github.com/pingcap/tiup/pkg/cliutil"
 	"github.com/pingcap/tiup/pkg/cluster/ansible"
 	"github.com/pingcap/tiup/pkg/cluster/spec"
@@ -66,7 +65,7 @@ func newImportCmd() *cobra.Command {
 
 			exist, err := tidbSpec.Exist(clsName)
 			if err != nil {
-				return errors.AddStack(err)
+				return err
 			}
 
 			if exist {

components/cluster/command/test.go

@@ -43,7 +43,7 @@ func newTestCmd() *cobra.Command {
 
 			exist, err := tidbSpec.Exist(clusterName)
 			if err != nil {
-				return perrs.AddStack(err)
+				return err
 			}
 
 			if !exist {

components/dm/ansible/import.go

@@ -76,7 +76,7 @@ func searchConfigFile(dir string) (fname string, err error) {
 func readConfigFile(dir string) (file *ini.File, err error) {
 	fname, err := searchConfigFile(dir)
 	if err != nil {
-		return nil, errors.AddStack(err)
+		return nil, err
 	}
 
 	file, err = ini.Load(fname)
@@ -205,7 +205,7 @@ func setConfig(config *map[string]interface{}, k string, v interface{}) {
 func (im *Importer) handleWorkerConfig(srv *spec.WorkerSpec, fname string) error {
 	data, err := im.fetchFile(srv.Host, srv.SSHPort, fname)
 	if err != nil {
-		return errors.AddStack(err)
+		return err
 	}
 
 	config := new(Config)
@@ -255,7 +255,7 @@ func (im *Importer) ScpSourceToMaster(topo *spec.Specification) (err error) {
 
 			err = e.Transfer(f.Name(), filepath.Join(target, addr+".yml"), false)
 			if err != nil {
-				return errors.AddStack(err)
+				return err
 			}
 		}
 	}
@@ -278,7 +278,7 @@ func (im *Importer) ImportFromAnsibleDir() (clusterName string, meta *spec.Metad
 
 	cfg, err := readConfigFile(dir)
 	if err != nil {
-		return "", nil, errors.AddStack(err)
+		return "", nil, err
 	}
 
 	fname := filepath.Join(dir, inventoryFileName)
@@ -336,11 +336,11 @@ func (im *Importer) ImportFromAnsibleDir() (clusterName string, meta *spec.Metad
 				runFileName := filepath.Join(host.Vars["deploy_dir"], "scripts", "run_dm-master.sh")
 				data, err := im.fetchFile(srv.Host, srv.SSHPort, runFileName)
 				if err != nil {
-					return "", nil, errors.AddStack(err)
+					return "", nil, err
 				}
 				deployDir, flags, err := parseRunScript(data)
 				if err != nil {
-					return "", nil, errors.AddStack(err)
+					return "", nil, err
 				}
 
 				if deployDir == "" {
@@ -384,11 +384,11 @@ func (im *Importer) ImportFromAnsibleDir() (clusterName string, meta *spec.Metad
 				runFileName := filepath.Join(host.Vars["deploy_dir"], "scripts", "run_dm-worker.sh")
 				data, err := im.fetchFile(srv.Host, srv.SSHPort, runFileName)
 				if err != nil {
-					return "", nil, errors.AddStack(err)
+					return "", nil, err
 				}
 				deployDir, flags, err := parseRunScript(data)
 				if err != nil {
-					return "", nil, errors.AddStack(err)
+					return "", nil, err
 				}
 
 				if deployDir == "" {
@@ -427,7 +427,7 @@ func (im *Importer) ImportFromAnsibleDir() (clusterName string, meta *spec.Metad
 
 				err = im.handleWorkerConfig(&srv, configFileName)
 				if err != nil {
-					return "", nil, errors.AddStack(err)
+					return "", nil, err
 				}
 
 				topo.Workers = append(topo.Workers, srv)
@@ -445,12 +445,12 @@ func (im *Importer) ImportFromAnsibleDir() (clusterName string, meta *spec.Metad
 				runFileName := filepath.Join(host.Vars["deploy_dir"], "scripts", "run_prometheus.sh")
 				data, err := im.fetchFile(srv.Host, srv.SSHPort, runFileName)
 				if err != nil {
-					return "", nil, errors.AddStack(err)
+					return "", nil, err
 				}
 
 				deployDir, flags, err := parseRunScript(data)
 				if err != nil {
-					return "", nil, errors.AddStack(err)
+					return "", nil, err
 				}
 
 				if deployDir == "" {
@@ -493,12 +493,12 @@ func (im *Importer) ImportFromAnsibleDir() (clusterName string, meta *spec.Metad
 				runFileName := filepath.Join(host.Vars["deploy_dir"], "scripts", "run_alertmanager.sh")
 				data, err := im.fetchFile(srv.Host, srv.SSHPort, runFileName)
 				if err != nil {
-					return "", nil, errors.AddStack(err)
+					return "", nil, err
 				}
 
 				deployDir, flags, err := parseRunScript(data)
 				if err != nil {
-					return "", nil, errors.AddStack(err)
+					return "", nil, err
 				}
 
 				if deployDir == "" {
@@ -550,11 +550,11 @@ func (im *Importer) ImportFromAnsibleDir() (clusterName string, meta *spec.Metad
 				runFileName := filepath.Join(host.Vars["deploy_dir"], "scripts", "run_grafana.sh")
 				data, err := im.fetchFile(srv.Host, srv.SSHPort, runFileName)
 				if err != nil {
-					return "", nil, errors.AddStack(err)
+					return "", nil, err
 				}
 				_, flags, err := parseRunScript(data)
 				if err != nil {
-					return "", nil, errors.AddStack(err)
+					return "", nil, err
 				}
 
 				for k, v := range flags {

components/dm/command/import.go

@@ -39,17 +39,17 @@ func newImportCmd() *cobra.Command {
 		Short: "Import an exist DM 1.0 cluster from dm-ansible and re-deploy 2.0 version",
 		RunE: func(cmd *cobra.Command, args []string) error {
 			if err := supportVersion(clusterVersion); err != nil {
-				return errors.AddStack(err)
+				return err
 			}
 
 			importer, err := ansible.NewImporter(ansibleDir, inventoryFileName, gOpt.SSHType, gOpt.SSHTimeout)
 			if err != nil {
-				return errors.AddStack(err)
+				return err
 			}
 
 			clusterName, meta, err := importer.ImportFromAnsibleDir()
 			if err != nil {
-				return errors.AddStack(err)
+				return err
 			}
 
 			if rename != "" {
@@ -58,7 +58,7 @@ func newImportCmd() *cobra.Command {
 
 			err = importer.ScpSourceToMaster(meta.Topology)
 			if err != nil {
-				return errors.AddStack(err)
+				return err
 			}
 
 			data, err := yaml.Marshal(meta.Topology)
@@ -86,7 +86,7 @@ func newImportCmd() *cobra.Command {
 						clusterName,
 					))
 				if err != nil {
-					return errors.AddStack(err)
+					return err
 				}
 			}
 
@@ -104,7 +104,7 @@ func newImportCmd() *cobra.Command {
 			)
 
 			if err != nil {
-				return errors.AddStack(err)
+				return err
 			}
 
 			return nil

components/dm/command/scale_in.go

@@ -143,13 +143,13 @@ func ScaleInDMCluster(
 				name := instance.(*dm.MasterInstance).Name
 				err := dmMasterClient.OfflineMaster(name, nil)
 				if err != nil {
-					return errors.AddStack(err)
+					return err
 				}
 			case dm.ComponentDMWorker:
 				name := instance.(*dm.WorkerInstance).Name
 				err := dmMasterClient.OfflineWorker(name, nil)
 				if err != nil {
-					return errors.AddStack(err)
+					return err
 				}
 			}
 

components/playground/command.go

@@ -157,7 +157,7 @@ func newDisplay() *cobra.Command {
 func scaleIn(pids []int) error {
 	port, err := targetTag()
 	if err != nil {
-		return errors.AddStack(err)
+		return err
 	}
 
 	var cmds []Command
@@ -176,7 +176,7 @@ func scaleIn(pids []int) error {
 func scaleOut(args []string, opt *bootOptions) (num int, err error) {
 	port, err := targetTag()
 	if err != nil {
-		return 0, errors.AddStack(err)
+		return 0, err
 	}
 
 	cmds := buildCommands(ScaleOutCommandType, opt)
@@ -191,7 +191,7 @@ func scaleOut(args []string, opt *bootOptions) (num int, err error) {
 func display(args []string) error {
 	port, err := targetTag()
 	if err != nil {
-		return errors.AddStack(err)
+		return err
 	}
 	c := Command{
 		CommandType: DisplayCommandType,

components/playground/grafana.go

@@ -54,7 +54,7 @@ func newGrafana(version string, host string) *grafana {
 func writeDatasourceConfig(fname string, clusterName string, p8sURL string) error {
 	err := makeSureDir(fname)
 	if err != nil {
-		return errors.AddStack(err)
+		return err
 	}
 
 	tpl := `apiVersion: 1
@@ -100,7 +100,7 @@ func replaceDatasource(dashboardDir string, datasourceName string) error {
 
 		data, err := ioutil.ReadFile(path)
 		if err != nil {
-			return err
+			return errors.AddStack(err)
 		}
 
 		s := string(data)
@@ -113,7 +113,7 @@ func replaceDatasource(dashboardDir string, datasourceName string) error {
 	})
 
 	if err != nil {
-		return errors.AddStack(err)
+		return err
 	}
 
 	return nil
@@ -122,7 +122,7 @@ func replaceDatasource(dashboardDir string, datasourceName string) error {
 func writeDashboardConfig(fname string, clusterName string, dir string) error {
 	err := makeSureDir(fname)
 	if err != nil {
-		return errors.AddStack(err)
+		return err
 	}
 
 	tpl := `apiVersion: 1
@@ -157,19 +157,19 @@ var clusterName string = "playground"
 func (g *grafana) start(ctx context.Context, dir string, p8sURL string) (err error) {
 	g.port, err = utils.GetFreePort(g.host, 3000)
 	if err != nil {
-		return errors.AddStack(err)
+		return err
 	}
 
 	fname := filepath.Join(dir, "conf", "provisioning", "dashboards", "dashboard.yml")
 	err = writeDashboardConfig(fname, clusterName, filepath.Join(dir, "dashboards"))
 	if err != nil {
-		return errors.AddStack(err)
+		return err
 	}
 
 	fname = filepath.Join(dir, "conf", "provisioning", "datasources", "datasource.yml")
 	err = writeDatasourceConfig(fname, clusterName, p8sURL)
 	if err != nil {
-		return errors.AddStack(err)
+		return err
 	}
 
 	tpl := `
@@ -214,7 +214,7 @@ http_port = %d
 	}
 	cmd, err := tiupexec.PrepareCommand(params)
 	if err != nil {
-		return errors.AddStack(err)
+		return err
 	}
 	cmd.Stdout = nil
 	cmd.Stderr = nil

components/playground/main.go

@@ -124,17 +124,17 @@ Examples:
 
 			port, err := utils.GetFreePort("0.0.0.0", 9527)
 			if err != nil {
-				return errors.AddStack(err)
+				return err
 			}
 			err = dumpPort(filepath.Join(dataDir, "port"), port)
 			p := NewPlayground(dataDir, port)
 			if err != nil {
-				return errors.AddStack(err)
+				return err
 			}
 
 			env, err := environment.InitEnv(repository.Options{})
 			if err != nil {
-				return errors.AddStack(err)
+				return err
 			}
 			environment.SetGlobalEnv(env)
 
@@ -189,7 +189,7 @@ Examples:
 
 			waitErr := p.wait()
 			if waitErr != nil {
-				return errors.AddStack(waitErr)
+				return waitErr
 			}
 
 			return nil

components/playground/monitor.go

@@ -92,7 +92,7 @@ func newMonitor(ctx context.Context, version string, host, dir string) (*monitor
 
 	port, err := utils.GetFreePort(host, 9090)
 	if err != nil {
-		return nil, errors.AddStack(err)
+		return nil, err
 	}
 	addr := fmt.Sprintf("%s:%d", host, port)