public
/
mirror
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add missing second stage syncs
continuous-integration/drone/push Build is failing Details

This commit is contained in:
Daniel Liu 2022-02-26 00:17:02 -05:00
parent 1e14603367
commit 1a6a3f01f4
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
merlin/sync/command.go
View File

@ -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
}