Merge ~pjdc/ubuntu-mirror-charm/+git/ubuntu-mirror-charm:sleep-for-lockfile-deletion into ubuntu-mirror-charm:master

[Paul Collins]

sleep for 5 seconds before we starting mirroring to let upstream delete its lock file

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Haw Loeung (hloeung)]

LGTM

review: Approve (+1)

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 8057430070364561c903b9c058f9dc0698b7c2ba

diff --git a/files/mirror-1stage.sh b/files/mirror-1stage.sh
index 0f97175..f578059 100755
--- a/files/mirror-1stage.sh
+++ b/files/mirror-1stage.sh
@@ -68,6 +68,15 @@ else
     url=${SOURCE_URL}
 fi
 
+# If upstream is close to us and triggers us via ssh, we may start
+# syncing before it has deleted its local lock file, which then
+# becomes a "file has vanished" and non-zero exit, causing the trace
+# file to not update, which makes the mirror seem stale when it isn't.
+# Therefore, let's just:
+log "== Sleeping to allow upstream delete its lock file =="
+sleep 5
+
+log "== Syncing files from source =="
 rsync --verbose --recursive --times --links --hard-links \
   --stats --delete --delete-before \
   --exclude "${lockfile}" --exclude ".trace/${role}-${myhostname}" \
diff --git a/files/mirror-2stage.sh b/files/mirror-2stage.sh
index 3a4ebc9..0d19e55 100755
--- a/files/mirror-2stage.sh
+++ b/files/mirror-2stage.sh
@@ -68,6 +68,14 @@ else
     url=${SOURCE_URL}
 fi
 
+# If upstream is close to us and triggers us via ssh, we may start
+# syncing before it has deleted its local lock file, which then
+# becomes a "file has vanished" and non-zero exit, causing the trace
+# file to not update, which makes the mirror seem stale when it isn't.
+# Therefore, let's just:
+log "== Sleeping to allow upstream delete its lock file =="
+sleep 5
+
 log "== Syncing files from source - first stage =="
 rsync --verbose --recursive --times --links --hard-links \
   --stats \