Merge 65ffd2f into 7fbbbd5

pingcap · Aug 9, 2022 · d2e9fa2 · d2e9fa2
2 parents 7fbbbd5 + 65ffd2f
commit d2e9fa2
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/pkg/cluster/manager/transfer.go b/pkg/cluster/manager/transfer.go
@@ -63,7 +63,7 @@ func (m *Manager) Transfer(name string, opt TransferOptions, gOpt operator.Optio
 
 	uniqueHosts := map[string]set.StringSet{} // host-sshPort -> {remote-path}
 	topo.IterInstance(func(inst spec.Instance) {
-		key := fmt.Sprintf("%s-%d", inst.GetHost(), inst.GetSSHPort())
+		key := fmt.Sprintf("%d-%s", inst.GetSSHPort(), inst.GetHost())
 		if _, found := uniqueHosts[key]; !found {
 			if len(gOpt.Roles) > 0 && !filterRoles.Exist(inst.Role()) {
 				return
@@ -91,7 +91,7 @@ func (m *Manager) Transfer(name string, opt TransferOptions, gOpt operator.Optio
 
 	srcPath := opt.Local
 	for hostKey, i := range uniqueHosts {
-		host := strings.Split(hostKey, "-")[0]
+		host := hostKey[len(strings.Split(hostKey, "-")[0])+1:]
 		for _, p := range i.Slice() {
 			t := task.NewBuilder(m.logger)
 			if opt.Pull {