update image

Signed-off-by: husharp <[email protected]>
pingcap · Dec 19, 2023 · 04feb27 · 04feb27
1 parent 34bcaf1
commit 04feb27
Show file tree

Hide file tree

Showing 12 changed files with 16 additions and 57 deletions.
diff --git a/components/playground/instance/drainer.go b/components/playground/instance/drainer.go
@@ -19,7 +19,6 @@ import (
 	"path/filepath"
 	"strings"
 
-	tiupexec "github.com/pingcap/tiup/pkg/exec"
 	"github.com/pingcap/tiup/pkg/utils"
 )
 
@@ -84,10 +83,6 @@ func (d *Drainer) Start(ctx context.Context, version utils.Version) error {
 		args = append(args, fmt.Sprintf("--config=%s", d.ConfigPath))
 	}
 
-	var err error
-	if d.BinPath, err = tiupexec.PrepareBinary("drainer", version, d.BinPath); err != nil {
-		return err
-	}
 	d.Process = &process{cmd: PrepareCommand(ctx, d.BinPath, args, nil, d.Dir)}
 
 	logIfErr(d.Process.SetOutputFile(d.LogFile()))

diff --git a/components/playground/instance/instance.go b/components/playground/instance/instance.go
@@ -23,6 +23,7 @@ import (
 	"github.com/BurntSushi/toml"
 	"github.com/pingcap/errors"
 	"github.com/pingcap/tiup/pkg/cluster/spec"
+	tiupexec "github.com/pingcap/tiup/pkg/exec"
 	"github.com/pingcap/tiup/pkg/utils"
 )
 
@@ -70,8 +71,8 @@ type Instance interface {
 	// Wait Should only call this if the instance is started successfully.
 	// The implementation should be safe to call Wait multi times.
 	Wait() error
-	// BinPathCheck return the bin path to check component version.
-	BinPathCheck(utils.Version) string
+	// PrepareBinary use given binpath or download from tiup mirrors.
+	PrepareBinary(componentName string, version utils.Version) (string, error)
 }
 
 func (inst *instance) MetricAddr() (r MetricAddr) {
@@ -81,11 +82,13 @@ func (inst *instance) MetricAddr() (r MetricAddr) {
 	return
 }
 
-func (inst *instance) BinPathCheck(version utils.Version) string {
-	if inst.BinPath != "" {
-		return inst.BinPath
+func (inst *instance) PrepareBinary(componentName string, version utils.Version) (string, error) {
+	if instanceBinPath, err := tiupexec.PrepareBinary(componentName, version, inst.BinPath); err != nil {
+		return "", err
+	} else {
+		inst.BinPath = instanceBinPath
+		return instanceBinPath, nil
 	}
-	return version.String()
 }
 
 // CompVersion return the format to run specified version of a component.

diff --git a/components/playground/instance/pd.go b/components/playground/instance/pd.go
@@ -20,7 +20,6 @@ import (
 	"strings"
 
 	"github.com/pingcap/errors"
-	tiupexec "github.com/pingcap/tiup/pkg/exec"
 	"github.com/pingcap/tiup/pkg/utils"
 )
 
@@ -166,10 +165,6 @@ func (inst *PDInstance) Start(ctx context.Context, version utils.Version) error
 		}
 	}
 
-	var err error
-	if inst.BinPath, err = tiupexec.PrepareBinary("pd", version, inst.BinPath); err != nil {
-		return err
-	}
 	inst.Process = &process{cmd: PrepareCommand(ctx, inst.BinPath, args, nil, inst.Dir)}
 
 	logIfErr(inst.Process.SetOutputFile(inst.LogFile()))

diff --git a/components/playground/instance/pump.go b/components/playground/instance/pump.go
@@ -21,7 +21,6 @@ import (
 	"strings"
 	"time"
 
-	tiupexec "github.com/pingcap/tiup/pkg/exec"
 	"github.com/pingcap/tiup/pkg/utils"
 )
 
@@ -103,10 +102,6 @@ func (p *Pump) Start(ctx context.Context, version utils.Version) error {
 		args = append(args, fmt.Sprintf("--config=%s", p.ConfigPath))
 	}
 
-	var err error
-	if p.BinPath, err = tiupexec.PrepareBinary("pump", version, p.BinPath); err != nil {
-		return err
-	}
 	p.Process = &process{cmd: PrepareCommand(ctx, p.BinPath, args, nil, p.Dir)}
 
 	logIfErr(p.Process.SetOutputFile(p.LogFile()))

diff --git a/components/playground/instance/ticdc.go b/components/playground/instance/ticdc.go
@@ -19,7 +19,6 @@ import (
 	"path/filepath"
 	"strings"
 
-	tiupexec "github.com/pingcap/tiup/pkg/exec"
 	"github.com/pingcap/tiup/pkg/tidbver"
 	"github.com/pingcap/tiup/pkg/utils"
 )
@@ -76,10 +75,6 @@ func (c *TiCDC) Start(ctx context.Context, version utils.Version) error {
 		}
 	}
 
-	var err error
-	if c.BinPath, err = tiupexec.PrepareBinary("cdc", version, c.BinPath); err != nil {
-		return err
-	}
 	c.Process = &process{cmd: PrepareCommand(ctx, c.BinPath, args, nil, c.Dir)}
 
 	logIfErr(c.Process.SetOutputFile(c.LogFile()))

diff --git a/components/playground/instance/tidb.go b/components/playground/instance/tidb.go
@@ -20,7 +20,6 @@ import (
 	"strconv"
 	"strings"
 
-	tiupexec "github.com/pingcap/tiup/pkg/exec"
 	"github.com/pingcap/tiup/pkg/utils"
 )
 
@@ -80,10 +79,6 @@ func (inst *TiDBInstance) Start(ctx context.Context, version utils.Version) erro
 		args = append(args, "--enable-binlog=true")
 	}
 
-	var err error
-	if inst.BinPath, err = tiupexec.PrepareBinary("tidb", version, inst.BinPath); err != nil {
-		return err
-	}
 	inst.Process = &process{cmd: PrepareCommand(ctx, inst.BinPath, args, nil, inst.Dir)}
 
 	logIfErr(inst.Process.SetOutputFile(inst.LogFile()))

diff --git a/components/playground/instance/tiflash.go b/components/playground/instance/tiflash.go
@@ -20,7 +20,6 @@ import (
 	"path/filepath"
 	"strings"
 
-	tiupexec "github.com/pingcap/tiup/pkg/exec"
 	"github.com/pingcap/tiup/pkg/tidbver"
 	"github.com/pingcap/tiup/pkg/utils"
 )
@@ -150,10 +149,6 @@ func (inst *TiFlashInstance) Start(ctx context.Context, version utils.Version) e
 		fmt.Sprintf("--flash.proxy.log-file=%s", filepath.Join(inst.Dir, "tiflash_tikv.log")),
 	)
 
-	var err error
-	if inst.BinPath, err = tiupexec.PrepareBinary("tiflash", version, inst.BinPath); err != nil {
-		return err
-	}
 	inst.Process = &process{cmd: PrepareCommand(ctx, inst.BinPath, args, nil, inst.Dir)}
 
 	logIfErr(inst.Process.SetOutputFile(inst.LogFile()))

diff --git a/components/playground/instance/tiflash_pre7.go b/components/playground/instance/tiflash_pre7.go
@@ -26,7 +26,6 @@ import (
 	"github.com/pingcap/errors"
 	"github.com/pingcap/tiup/pkg/cluster/api"
 	"github.com/pingcap/tiup/pkg/cluster/spec"
-	tiupexec "github.com/pingcap/tiup/pkg/exec"
 	"github.com/pingcap/tiup/pkg/utils"
 )
 
@@ -92,10 +91,6 @@ func (inst *TiFlashInstance) startOld(ctx context.Context, version utils.Version
 		return err
 	}
 
-	if inst.BinPath, err = tiupexec.PrepareBinary("tiflash", version, inst.BinPath); err != nil {
-		return err
-	}
-
 	dirPath := filepath.Dir(inst.BinPath)
 	clusterManagerPath := getFlashClusterPath(dirPath)
 	if err = inst.checkConfigOld(wd, clusterManagerPath, version, tidbStatusAddrs, endpoints); err != nil {

diff --git a/components/playground/instance/tikv.go b/components/playground/instance/tikv.go
@@ -19,7 +19,6 @@ import (
 	"path/filepath"
 	"strings"
 
-	tiupexec "github.com/pingcap/tiup/pkg/exec"
 	"github.com/pingcap/tiup/pkg/utils"
 )
 
@@ -77,10 +76,6 @@ func (inst *TiKVInstance) Start(ctx context.Context, version utils.Version) erro
 	}
 
 	envs := []string{"MALLOC_CONF=prof:true,prof_active:false"}
-	var err error
-	if inst.BinPath, err = tiupexec.PrepareBinary("tikv", version, inst.BinPath); err != nil {
-		return err
-	}
 	inst.Process = &process{cmd: PrepareCommand(ctx, inst.BinPath, args, envs, inst.Dir)}
 
 	logIfErr(inst.Process.SetOutputFile(inst.LogFile()))

diff --git a/components/playground/instance/tikv_cdc.go b/components/playground/instance/tikv_cdc.go
@@ -19,7 +19,6 @@ import (
 	"path/filepath"
 	"strings"
 
-	tiupexec "github.com/pingcap/tiup/pkg/exec"
 	"github.com/pingcap/tiup/pkg/utils"
 )
 
@@ -65,10 +64,6 @@ func (c *TiKVCDC) Start(ctx context.Context, version utils.Version) error {
 		args = append(args, fmt.Sprintf("--config=%s", c.ConfigPath))
 	}
 
-	var err error
-	if c.BinPath, err = tiupexec.PrepareBinary("tikv-cdc", version, c.BinPath); err != nil {
-		return err
-	}
 	c.Process = &process{cmd: PrepareCommand(ctx, c.BinPath, args, nil, c.Dir)}
 
 	logIfErr(c.Process.SetOutputFile(c.LogFile()))

diff --git a/components/playground/instance/tiproxy.go b/components/playground/instance/tiproxy.go
@@ -21,7 +21,6 @@ import (
 	"strings"
 
 	"github.com/pelletier/go-toml"
-	tiupexec "github.com/pingcap/tiup/pkg/exec"
 	"github.com/pingcap/tiup/pkg/utils"
 )
 
@@ -103,10 +102,6 @@ func (c *TiProxy) Start(ctx context.Context, version utils.Version) error {
 		fmt.Sprintf("--config=%s", configPath),
 	}
 
-	if c.BinPath, err = tiupexec.PrepareBinary("tiproxy", version, c.BinPath); err != nil {
-		return err
-	}
-
 	c.Process = &process{cmd: PrepareCommand(ctx, c.BinPath, args, nil, c.Dir)}
 
 	logIfErr(c.Process.SetOutputFile(c.LogFile()))

diff --git a/components/playground/playground.go b/components/playground/playground.go
@@ -445,7 +445,13 @@ func (p *Playground) startInstance(ctx context.Context, inst instance.Instance)
 	if err != nil {
 		return err
 	}
-	fmt.Printf("Start %s instance:%s\n", inst.Component(), inst.BinPathCheck(version))
+
+	instanceBinPath, err := inst.PrepareBinary(inst.Component(), version)
+	if err != nil {
+		return err
+	}
+	fmt.Printf("Start %s instance:%s\n", inst.Component(), instanceBinPath)
+
 	err = inst.Start(ctx, version)
 	if err != nil {
 		return err