Merge remote-tracking branch 'upstream/master' into fix_port_conflict…

…_comp_name

components/cluster/command/import.go

@@ -108,7 +108,7 @@ func newImportCmd() *cobra.Command {
 				return err
 			}
 
-			// copy SSH key to TiOps profile directory
+			// copy SSH key to TiUP profile directory
 			if err = tiuputils.CreateDir(spec.ClusterPath(clsName, "ssh")); err != nil {
 				return err
 			}

components/dm/command/scale_in.go

@@ -172,7 +172,6 @@ func ScaleInDMCluster(
 					return errors.Annotatef(err, "failed to delete public key")
 				}
 			}
-
 		}
 	}
 

components/dm/spec/cluster.go

@@ -70,7 +70,7 @@ func (m *Metadata) GetBaseMeta() *cspec.BaseMeta {
 // GetSpecManager return the spec manager of dm cluster.
 func GetSpecManager() *cspec.SpecManager {
 	if specManager == nil {
-		specManager = cspec.NewSpec(filepath.Join(cspec.ProfileDir(), cspec.TiOpsClusterDir), func() cspec.Metadata {
+		specManager = cspec.NewSpec(filepath.Join(cspec.ProfileDir(), cspec.TiUPClusterDir), func() cspec.Metadata {
 			return &Metadata{
 				Topology: new(Specification),
 			}

components/dm/spec/logic.go

@@ -26,7 +26,7 @@ import (
 	"github.com/pingcap/tiup/pkg/cluster/template/scripts"
 )
 
-// Components names supported by TiOps
+// Components names supported by TiUP
 const (
 	ComponentDMMaster     = spec.ComponentDMMaster
 	ComponentDMWorker     = spec.ComponentDMWorker

examples/dm/minimal.yaml

@@ -4,7 +4,6 @@
 # - 3 worker nodes
 # You can change the hosts according your environment
 ---
-
 global:
   user: "tidb"
   ssh_port: 22

examples/dm/topology.example.yaml

@@ -1,5 +1,4 @@
 ---
-
 # Global variables are applied to all deployments and as the default value of
 # them if the specific deployment value missing.
 global:
@@ -17,7 +16,6 @@ server_configs:
   worker:
     log-level: info
 
-
 master_servers:
   - host: 10.0.1.11
     name: master1

examples/minimal.yaml

@@ -32,4 +32,4 @@ grafana_servers:
   - host: 172.19.0.103
 
 alertmanager_servers:
-  - host: 172.19.0.102
+  - host: 172.19.0.102

examples/multi-dc.yaml

@@ -1,4 +1,3 @@
-
 # Tip: PD priority needs to be manually set using the PD-ctl client tool. such as, member Leader_priority PD-name numbers.
 global:
   user: "tidb"
@@ -17,7 +16,7 @@ server_configs:
     readpool.storage.use-unified-pool: true
     readpool.storage.low-concurrency: 8
   pd:
-    replication.location-labels: ["zone","dc","rack","host"]
+    replication.location-labels: ["zone", "dc", "rack", "host"]
     replication.max-replicas: 5
     schedule.tolerant-size-ratio: 20.0
     schedule.max-merge-region-size: 20
@@ -36,77 +35,77 @@ server_configs:
         - key: "dc"
           value: "bja"
 pd_servers:
- - host: 10.63.10.10
- - host: 10.63.10.11
- - host: 10.63.10.12
- - host: 10.63.10.13
- - host: 10.63.10.14
+  - host: 10.63.10.10
+  - host: 10.63.10.11
+  - host: 10.63.10.12
+  - host: 10.63.10.13
+  - host: 10.63.10.14
 tidb_servers:
- - host: 10.63.10.10
- - host: 10.63.10.11
- - host: 10.63.10.12
- - host: 10.63.10.13
- - host: 10.63.10.14
+  - host: 10.63.10.10
+  - host: 10.63.10.11
+  - host: 10.63.10.12
+  - host: 10.63.10.13
+  - host: 10.63.10.14
 tikv_servers:
- - host: 10.63.10.30 
-   ssh_port: 22
-   port: 20160
-   status_port: 20180
-   deploy_dir: "/data/deploy1/tikv-20160"
-   config:
-     server.labels:
-       zone: sh
-       dc: sha
-       rack: rack1
-       host: host1
- - host: 10.63.10.31
-   ssh_port: 22
-   port: 20161
-   status_port: 20181
-   deploy_dir: "/data/deploy2/tikv-20161"
-   config:
-     server.labels:
-       zone: sh
-       dc: sha
-       rack: rack1
-       host: host2
- - host: 10.63.10.32
-   ssh_port: 22
-   port: 20160
-   status_port: 20180
-   deploy_dir: "/data/deploy1/tikv-20160"
-   config:
-     server.labels:
-       zone: sh
-       dc: shb
-       rack: rack1
-       host: host1
- - host: 10.63.10.33
-   ssh_port: 22
-   port: 20161
-   status_port: 20181
-   deploy_dir: "/data/deploy2/tikv-20161"
-   config:
-     server.labels:
-       zone: sh
-       dc: shb
-       rack: rack1
-       host: host2
- - host: 10.63.10.34
-   ssh_port: 22
-   port: 20160
-   deploy_dir: "/data/deploy1/tikv-20160"
-   config:
-     server.labels:
-       zone: bj
-       dc: bja
-       rack: rack1
-       host: host1
-     readpool.storage.use-unified-pool: true
-     readpool.storage.low-concurrency: 10
-     raftstore.raft-min-election-timeout-ticks: 1000
-     raftstore.raft-max-election-timeout-ticks: 1020
+  - host: 10.63.10.30
+    ssh_port: 22
+    port: 20160
+    status_port: 20180
+    deploy_dir: "/data/deploy1/tikv-20160"
+    config:
+      server.labels:
+        zone: sh
+        dc: sha
+        rack: rack1
+        host: host1
+  - host: 10.63.10.31
+    ssh_port: 22
+    port: 20161
+    status_port: 20181
+    deploy_dir: "/data/deploy2/tikv-20161"
+    config:
+      server.labels:
+        zone: sh
+        dc: sha
+        rack: rack1
+        host: host2
+  - host: 10.63.10.32
+    ssh_port: 22
+    port: 20160
+    status_port: 20180
+    deploy_dir: "/data/deploy1/tikv-20160"
+    config:
+      server.labels:
+        zone: sh
+        dc: shb
+        rack: rack1
+        host: host1
+  - host: 10.63.10.33
+    ssh_port: 22
+    port: 20161
+    status_port: 20181
+    deploy_dir: "/data/deploy2/tikv-20161"
+    config:
+      server.labels:
+        zone: sh
+        dc: shb
+        rack: rack1
+        host: host2
+  - host: 10.63.10.34
+    ssh_port: 22
+    port: 20160
+    deploy_dir: "/data/deploy1/tikv-20160"
+    config:
+      server.labels:
+        zone: bj
+        dc: bja
+        rack: rack1
+        host: host1
+      readpool.storage.use-unified-pool: true
+      readpool.storage.low-concurrency: 10
+      raftstore.raft-min-election-timeout-ticks: 1000
+      raftstore.raft-max-election-timeout-ticks: 1020
 monitoring_servers:
- - host: 10.63.10.09
+  - host: 10.63.10.09
 grafana_servers:
- - host: 10.63.10.09
+  - host: 10.63.10.09