From 5d43e48312ab0ad74be0e6bbe6bc29df20917e98 Mon Sep 17 00:00:00 2001 From: "Ali R. Vahdati" Date: Thu, 16 May 2024 11:54:58 +0200 Subject: [PATCH] Remove the `-z` option from rsync --- datasetIngestor/syncDataToFileserver_unix.go | 6 +++--- datasetIngestor/syncDataToFileserver_unix_test.go | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/datasetIngestor/syncDataToFileserver_unix.go b/datasetIngestor/syncDataToFileserver_unix.go index 8baa50c..86f3ab0 100644 --- 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 --stderr=error + // Full command: /usr/bin/rsync -e ssh -avx --progress -r --files-from --stderr=error } else { rsyncFlags = append(rsyncFlags, "-q", "--msgs2stderr") - // Full command: /usr/bin/rsync -e ssh -avxz --progress -r --files-from -q --msgs2stderr + // Full command: /usr/bin/rsync -e ssh -avx --progress -r --files-from -q --msgs2stderr } 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 index 72123c1..8e630b4 100644 --- a/datasetIngestor/syncDataToFileserver_unix_test.go +++ b/datasetIngestor/syncDataToFileserver_unix_test.go @@ -38,7 +38,7 @@ 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", @@ -46,7 +46,7 @@ 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 -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", @@ -54,7 +54,7 @@ func TestBuildRsyncCmd(t *testing.T) { 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", @@ -62,7 +62,7 @@ func TestBuildRsyncCmd(t *testing.T) { 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", }, }