Merge branch 'master' into warn-scale-global-cfg

.github/ISSUE_TEMPLATE/feature-request.md

@@ -12,8 +12,11 @@ labels: type/feature-request
 **Describe the feature you'd like:**
 <!-- A clear and concise description of what you want to happen. -->
 
+**Why the featue is needed:**
+<!-- Why the feature is needed by users? If you can, explain some scenarios how users might use this. -->
+
 **Describe alternatives you've considered:**
 <!-- A clear and concise description of any alternative solutions or features you've considered. -->
 
 **Teachability, Documentation, Adoption, Migration Strategy:**
-<!-- If you can, explain some scenarios how users might use this, situations it would be helpful in. Any API designs, mockups, or diagrams are also helpful. -->
+<!-- Any API designs, mockups, or diagrams are helpful. -->

cmd/mirror.go

@@ -66,6 +66,7 @@ of components or the repository itself.`,
 		newMirrorCloneCmd(),
 		newMirrorMergeCmd(),
 		newMirrorPublishCmd(),
+		newMirrorShowCmd(),
 		newMirrorSetCmd(),
 		newMirrorModifyCmd(),
 		newMirrorGrantCmd(),
@@ -139,6 +140,21 @@ func newMirrorSignCmd() *cobra.Command {
 	return cmd
 }
 
+// the `mirror show` sub command
+func newMirrorShowCmd() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "show",
+		Short: "Show mirror address",
+		Long:  `Show current mirror address`,
+		RunE: func(cmd *cobra.Command, args []string) error {
+			fmt.Println(environment.Mirror())
+			return nil
+		},
+	}
+
+	return cmd
+}
+
 // the `mirror set` sub command
 func newMirrorSetCmd() *cobra.Command {
 	var (

components/playground/playground.go

@@ -677,12 +677,12 @@ func (p *Playground) bootCluster(ctx context.Context, env *environment.Environme
 		}
 		options.version = version.String()
 
-		fmt.Println(color.YellowString(`Use the latest stable version: %s
+		fmt.Println(color.YellowString(`No TiDB version specified, using the latest stable version: %s
 
+If you'd like to use a TiDB version other than %s, cancel and retry with the following arguments:
     Specify version manually:   tiup playground <version>
-    The stable version:         tiup playground v4.0.0
     The nightly version:        tiup playground nightly
-`, options.version))
+`, options.version, options.version))
 	}
 
 	if !utils.Version(options.version).IsNightly() {

pkg/repository/clone_mirror.go

@@ -383,7 +383,7 @@ func download(targetDir, tmpDir string, repo *V1Repository, item *v1manifest.Ver
 	// Skip installed file if exists file valid
 	if utils.IsExist(dstFile) {
 		if err := validate(targetDir); err == nil {
-			fmt.Println("Skip exists file:", filepath.Join(targetDir, item.URL))
+			fmt.Println("Skipping existing file:", filepath.Join(targetDir, item.URL))
 			return nil
 		}
 	}
@@ -464,6 +464,9 @@ func combineVersions(versions *[]string,
 					if latest == "" {
 						continue
 					}
+					if selectedVersion != utils.LatestVersionAlias {
+						fmt.Printf("%s %s/%s %s not found, using %s instead.\n", manifest.ID, os, arch, selectedVersion, latest)
+					}
 					selectedVersion = latest
 				}
 				if !result.Exist(selectedVersion) {

pkg/repository/progress.go

@@ -42,7 +42,7 @@ func (p *ProgressBar) Start(url string, size int64) {
 	p.size = size
 	p.bar = pb.Start64(size)
 	p.bar.Set(pb.Bytes, true)
-	p.bar.SetTemplateString(fmt.Sprintf(`download %s {{counters . }} {{percent . }} {{speed . }}`, url))
+	p.bar.SetTemplateString(fmt.Sprintf(`download %s {{counters . }} {{percent . }} {{speed . "%%s/s" "? MiB/s"}}`, url))
 }
 
 // SetCurrent implement the DownloadProgress interface

pkg/utils/semver.go

@@ -23,6 +23,9 @@ import (
 // NightlyVersionAlias represents latest build of master branch.
 const NightlyVersionAlias = "nightly"
 
+// LatestVersionAlias represents the latest build (excluding nightly versions).
+const LatestVersionAlias = "latest"
+
 // FmtVer converts a version string to SemVer format, if the string is not a valid
 // SemVer and fails to parse and convert it, an error is raised.
 func FmtVer(ver string) (string, error) {
@@ -33,6 +36,11 @@ func FmtVer(ver string) (string, error) {
 		return v, nil
 	}
 
+	// latest version is an alias
+	if strings.ToLower(v) == LatestVersionAlias {
+		return v, nil
+	}
+
 	if !strings.HasPrefix(ver, "v") {
 		v = fmt.Sprintf("v%s", ver)
 	}