From a58ad34a5c6bf043b3dfb9246e6f41338d51a559 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Fri, 19 Jun 2020 12:27:46 +1000 Subject: [PATCH] mirror-update: restore -t to rsync commands We found that new data (since we removed -t) was no correctly being skipped for re-download. We have found that this doesn't happen with -t on later rsyncs, which have included fixes for -t to not touch the timestamps if things are not updated. We have updated mirror-update to Focal that has this rsync, so restore the flag. Change-Id: I3fa16dbf6487a442549c540796807ef4916d4e6e --- .../roles/mirror-update/files/centos-mirror-update | 4 ++-- playbooks/roles/mirror-update/files/epel-mirror-update | 4 ++-- .../roles/mirror-update/files/fedora-mirror-update | 6 +++--- .../roles/mirror-update/files/opensuse-mirror-update | 10 +++++----- .../roles/mirror-update/files/publish-mirror-logs | 2 +- .../mirror-update/files/yum-puppetlabs-mirror-update | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/playbooks/roles/mirror-update/files/centos-mirror-update b/playbooks/roles/mirror-update/files/centos-mirror-update index 75614c5627..27a9a49d26 100755 --- a/playbooks/roles/mirror-update/files/centos-mirror-update +++ b/playbooks/roles/mirror-update/files/centos-mirror-update @@ -38,7 +38,7 @@ if ! [ -f $BASE/8 ]; then fi date --iso-8601=ns echo "Running Centos 8 rsync..." -$K5START rsync -rlvz \ +$K5START rsync -rltvz \ --delete \ --delete-excluded \ --exclude="isos" \ @@ -75,7 +75,7 @@ for REPO in $REPOS; do date --iso-8601=ns echo "Running rsync..." - $K5START rsync -rlvz \ + $K5START rsync -rltvz \ --delete \ --delete-excluded \ --exclude="atomic" \ diff --git a/playbooks/roles/mirror-update/files/epel-mirror-update b/playbooks/roles/mirror-update/files/epel-mirror-update index 7fab12056c..11073d6012 100755 --- a/playbooks/roles/mirror-update/files/epel-mirror-update +++ b/playbooks/roles/mirror-update/files/epel-mirror-update @@ -42,7 +42,7 @@ fi date --iso-8601=ns echo "Running rsync..." -$K5START rsync -rlvz \ +$K5START rsync -rltvz \ --delete \ --delete-excluded \ --exclude="SRPMS" \ @@ -72,7 +72,7 @@ date --iso-8601=ns echo "Running rsync..." # --no-perms because some of the top-level directories are 02755 # (setgid) and we can't set that on AFS -$K5START rsync -rlvz --no-perms \ +$K5START rsync -rltvz --no-perms \ --delete \ --delete-excluded \ --exclude="Everything/SRPMS" \ diff --git a/playbooks/roles/mirror-update/files/fedora-mirror-update b/playbooks/roles/mirror-update/files/fedora-mirror-update index 9de3cdf8d9..af210374a4 100755 --- a/playbooks/roles/mirror-update/files/fedora-mirror-update +++ b/playbooks/roles/mirror-update/files/fedora-mirror-update @@ -52,7 +52,7 @@ for REPO in releases/30 releases/31 releases/32; do fi echo_ts "Running rsync for $REPO..." - $K5START rsync -rlvz \ + $K5START rsync -rltvz \ --delete \ --delete-excluded \ --exclude="Cloud/x86_64/images/*.box" \ @@ -77,7 +77,7 @@ for REPO in updates/30 updates/31 updates/32; do fi echo_ts "Running rsync for $REPO..." - $K5START rsync -rlvz \ + $K5START rsync -rltvz \ --delete \ --delete-excluded \ --exclude="aarch64/" \ @@ -98,7 +98,7 @@ if ! [ -f $BASE/atomic ]; then fi echo_ts "Running rsync atomic..." -$K5START rsync -rlvz \ +$K5START rsync -rltvz \ --delete \ --delete-excluded \ --exclude="testing/" \ diff --git a/playbooks/roles/mirror-update/files/opensuse-mirror-update b/playbooks/roles/mirror-update/files/opensuse-mirror-update index a82ec17ef2..60653c2727 100755 --- a/playbooks/roles/mirror-update/files/opensuse-mirror-update +++ b/playbooks/roles/mirror-update/files/opensuse-mirror-update @@ -62,7 +62,7 @@ for DISTVER in 15.1; do date --iso-8601=ns echo "Running rsync distribution $DISTVER ..." - $K5START rsync -rlvz \ + $K5START rsync -rltvz \ --delete --stats \ --delete-excluded \ --exclude="iso" \ @@ -76,7 +76,7 @@ for DISTVER in 15.1; do date --iso-8601=ns echo "Running rsync updates $DISTVER ..." - $K5START rsync -rlvz \ + $K5START rsync -rltvz \ --delete --stats \ --delete-excluded \ --exclude="src/" \ @@ -92,7 +92,7 @@ for obs_repo in ${OBS_REPOS[@]}; do $K5START mkdir -p $BASE/$REPO fi echo "Running rsync ${obs_repo} ..." - $K5START rsync -rlvz \ + $K5START rsync -rltvz \ --delete --stats \ --delete-excluded \ --exclude="src/" \ @@ -109,7 +109,7 @@ fi date --iso-8601=ns echo "Running rsync distribution $REPO ..." # TW is large and can have failures, be more resilient -$K5START rsync -rlvz \ +$K5START rsync -rltvz \ --delete --stats \ --delete-excluded \ --exclude="i586" \ @@ -123,7 +123,7 @@ fi date --iso-8601=ns echo "Running rsync distribution $REPO ..." -$K5START rsync -rlvz \ +$K5START rsync -rltvz \ --timeout=600 \ --delete --stats \ --delete-excluded \ diff --git a/playbooks/roles/mirror-update/files/publish-mirror-logs b/playbooks/roles/mirror-update/files/publish-mirror-logs index 9afa1ed79c..32487041ed 100755 --- a/playbooks/roles/mirror-update/files/publish-mirror-logs +++ b/playbooks/roles/mirror-update/files/publish-mirror-logs @@ -16,7 +16,7 @@ DEST="/afs/.openstack.org/mirror/logs/" K5START="k5start -t -f /etc/logs.keytab service/logs-mirror --" -RSYNC="rsync -rliz" +RSYNC="rsync -rltvz" $K5START $RSYNC /var/log/rsync-mirrors $DEST $K5START $RSYNC /var/log/afs-release $DEST diff --git a/playbooks/roles/mirror-update/files/yum-puppetlabs-mirror-update b/playbooks/roles/mirror-update/files/yum-puppetlabs-mirror-update index 30f5014f30..f77f36f52c 100755 --- a/playbooks/roles/mirror-update/files/yum-puppetlabs-mirror-update +++ b/playbooks/roles/mirror-update/files/yum-puppetlabs-mirror-update @@ -36,7 +36,7 @@ date --iso-8601=ns echo "Running rsync..." # We don't need cisco-wrlinux arch in OpenStack Infra. -$K5START rsync -rlvz \ +$K5START rsync -rltvz \ --delete \ --delete-excluded \ --exclude="cisco-wrlinux" \