Remove the -z option from rsync

paulscherrerinstitute · May 16, 2024 · 5d43e48 · 5d43e48
1 parent 93dd6a3
commit 5d43e48
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/datasetIngestor/syncDataToFileserver_unix.go b/datasetIngestor/syncDataToFileserver_unix.go
@@ -60,16 +60,16 @@ func getRsyncVersion() (string, error) {
 
 // Check rsync version and adjust command accordingly
 func buildRsyncCmd(versionNumber, absFileListing, fullSourceFolderPath, serverConnectString string) *exec.Cmd {
-	rsyncFlags := []string{"-e", "ssh", "-avxz", "--progress"}
+	rsyncFlags := []string{"-e", "ssh", "-avx", "--progress"}
 	if absFileListing != "" {
 		rsyncFlags = append([]string{"-r", "--files-from", absFileListing}, rsyncFlags...)
 	}
 	if version.Compare(versionNumber, "3.2.3", ">=") {
 		rsyncFlags = append(rsyncFlags, "--stderr=error")
-		// Full command: /usr/bin/rsync -e ssh -avxz --progress -r --files-from <absFileListing> --stderr=error <fullSourceFolderPath> <serverConnectString>
+		// Full command: /usr/bin/rsync -e ssh -avx --progress -r --files-from <absFileListing> --stderr=error <fullSourceFolderPath> <serverConnectString>
 	} else {
 		rsyncFlags = append(rsyncFlags, "-q", "--msgs2stderr")
-		// Full command: /usr/bin/rsync -e ssh -avxz --progress -r --files-from <absFileListing> -q --msgs2stderr <fullSourceFolderPath> <serverConnectString>
+		// Full command: /usr/bin/rsync -e ssh -avx --progress -r --files-from <absFileListing> -q --msgs2stderr <fullSourceFolderPath> <serverConnectString>
 	}
 	rsyncCmd := exec.Command("/usr/bin/rsync", append(rsyncFlags, fullSourceFolderPath, serverConnectString)...)
 	return rsyncCmd

diff --git a/datasetIngestor/syncDataToFileserver_unix_test.go b/datasetIngestor/syncDataToFileserver_unix_test.go
@@ -38,31 +38,31 @@ func TestBuildRsyncCmd(t *testing.T) {
 			absFileListing:   "/path/to/file",
 			fullSourceFolder: "/source/folder",
 			serverConnectStr: "user@server:/dest/folder",
-			expectedCmd:      "/usr/bin/rsync -r --files-from /path/to/file -e ssh -avxz --progress --stderr=error /source/folder user@server:/dest/folder",
+			expectedCmd:      "/usr/bin/rsync -r --files-from /path/to/file -e ssh -avx --progress --stderr=error /source/folder user@server:/dest/folder",
 		},
 		{
 			name:             "rsync version < 3.2.3, absFileListing not empty",
 			versionNumber:    "3.2.2",
 			absFileListing:   "/path/to/file",
 			fullSourceFolder: "/source/folder",
 			serverConnectStr: "user@server:/dest/folder",
-			expectedCmd:      "/usr/bin/rsync -r --files-from /path/to/file -e ssh -avxz --progress -q --msgs2stderr /source/folder user@server:/dest/folder",
+			expectedCmd:      "/usr/bin/rsync -r --files-from /path/to/file -e ssh -avx --progress -q --msgs2stderr /source/folder user@server:/dest/folder",
 		},
 		{
 			name:             "rsync version >= 3.2.3, absFileListing empty",
 			versionNumber:    "3.2.3",
 			absFileListing:   "",
 			fullSourceFolder: "/source/folder",
 			serverConnectStr: "user@server:/dest/folder",
-			expectedCmd:      "/usr/bin/rsync -e ssh -avxz --progress --stderr=error /source/folder user@server:/dest/folder",
+			expectedCmd:      "/usr/bin/rsync -e ssh -avx --progress --stderr=error /source/folder user@server:/dest/folder",
 		},
 		{
 			name:             "rsync version < 3.2.3, absFileListing empty",
 			versionNumber:    "3.2.2",
 			absFileListing:   "",
 			fullSourceFolder: "/source/folder",
 			serverConnectStr: "user@server:/dest/folder",
-			expectedCmd:      "/usr/bin/rsync -e ssh -avxz --progress -q --msgs2stderr /source/folder user@server:/dest/folder",
+			expectedCmd:      "/usr/bin/rsync -e ssh -avx --progress -q --msgs2stderr /source/folder user@server:/dest/folder",
 		},
 	}