Merge pull request #496 from oldthreefeng/fix491

validate copy kubetarball
labring · Oct 15, 2020 · ac1f735 · ac1f735
2 parents a76ade0 + c87742d
commit ac1f735
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/install/download.go b/install/download.go
@@ -32,7 +32,18 @@ func SendPackage(location string, hosts []string, dst string, before, after *str
 				_ = SSHConfig.CmdAsync(host, *before)
 			}
 			if SSHConfig.IsFileExist(host, fullPath) {
-				logger.Warn("[%s]SendPackage: file is exist", host)
+				if SSHConfig.ValidateMd5sumLocalWithRemote(host, location, fullPath) {
+					logger.Info("[%s]SendPackage:  %s file is exist and ValidateMd5 success", host, fullPath)
+				} else {
+					rm := fmt.Sprintf("rm -f %s", fullPath)
+					_ = SSHConfig.Cmd(host, rm)
+					// del then copy
+					if ok := SSHConfig.CopyForMD5(host, location, fullPath, md5); ok {
+						logger.Info("[%s]copy file md5 validate success", host)
+					} else {
+						logger.Error("[%s]copy file md5 validate failed", host)
+					}
+				}
 			} else {
 				if ok := SSHConfig.CopyForMD5(host, location, fullPath, md5); ok {
 					logger.Info("[%s]copy file md5 validate success", host)

diff --git a/pkg/sshcmd/sshutil/scp.go b/pkg/sshcmd/sshutil/scp.go
@@ -380,3 +380,8 @@ func (ss *SSH) isCopyMd5Success(sshClient *ssh.Client, localFile, remoteFile str
 	}
 	return localMd5 == remoteMd5
 }
+
+func (ss *SSH) ValidateMd5sumLocalWithRemote(host, localFile, remoteFile string) bool {
+	localMd5 := md5sum.FromLocal(localFile)
+	return localMd5 == ss.Md5Sum(host, remoteFile)
+}