diff --git a/merlin/sync/command.go b/merlin/sync/command.go index d0a1915..2717309 100644 --- a/merlin/sync/command.go +++ b/merlin/sync/command.go @@ -100,12 +100,13 @@ func cscSyncCeph(repo *config.Repo) []string { } args = append(args, buildDownloadDir(repo)) - /* might need to implement two staged sync */ - /* - rsync ${RSYNC_OPTS} ${SOURCE_HOST}::ceph --recursive --times --links \ - --hard-links --delete-after \ - ${TARGET} - */ + args = append(args, []string{ + "&&", "rsync", "--stats", "--progress", "--quiet", "-4", "--address=" + config.Conf.IPv4Address, + repo.RsyncHost + "::ceph", + "--recursive", "--times", "--links", "--hard-links", "--delete-after", + }...) + args = append(args, buildDownloadDir(repo)) + return args } @@ -129,7 +130,16 @@ func cscSyncDebian(repo *config.Repo) []string { "--exclude", ".~tmp~/", "--timeout=3600", "-4", "--address=" + config.Conf.IPv4Address, } - // $RSYNC_HOST::$RSYNC_DIR/pool/ $TO/pool/ >> $LOGFILE 2>&1 + args = append(args, buildRsyncDaemonHost(repo) + "/pool/", buildDownloadDir(repo) + "/pool/") + + args = append(args, []string{"&&", "nice", "rsync", "-rlHtvp", + "--delay-updates", "--delete-after", + // --exclude "Archive-Update-in-Progress-${HOSTNAME}" \ + // --exclude "${TRACE_DIR}/${HOSTNAME}" \ + "--timeout=3600", "-4", "--address=" + config.Conf.IPv4Address, + }...) + args = append(args, buildRsyncDaemonHost(repo), buildDownloadDir(repo)) + return args } @@ -141,7 +151,7 @@ func cscSyncDebianCD(repo *config.Repo) []string { "--address=" + config.Conf.IPv4Address, // "--exclude", "Archive-Update-in-Progress-${HOSTNAME}" } - // $RSYNC_HOST::$RSYNC_DIR $TO >> $LOGFILE 2>&1 + args = append(args, buildRsyncDaemonHost(repo), buildDownloadDir(repo)) return args }