Merge lp:~hloeung/ubuntu-repository-cache/fix-initial-sync-perms into lp:ubuntu-repository-cache

[Haw Loeung]

Fix permissions for initial metadata sync - LP:1680860

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

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

[Paul Collins (pjdc)]

review: Approve (lgtm)

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

Change successfully merged at revision 277

=== modified file 'lib/ubuntu_repository_cache/metadata_sync.py'
--- lib/ubuntu_repository_cache/metadata_sync.py	2020-05-14 04:09:24 +0000
+++ lib/ubuntu_repository_cache/metadata_sync.py	2020-07-09 05:07:42 +0000
@@ -71,7 +71,7 @@
 # around subprocess - ~tribaal
 
 def rsync(from_path, to_path, options, log, flags="-r",
-          check_output=check_output, timeout=None):
+          check_output=check_output, user=None, timeout=None):
     """
     A wrapper around subprocess to execute an rsync between a source and a
     destination.
@@ -87,6 +87,8 @@
     cmd = ["/usr/bin/rsync", flags]
     if timeout:
         cmd = ["/usr/bin/timeout", str(timeout)] + cmd
+    if user:
+        cmd = ["sudo", "-u", user] + cmd
     cmd.extend(options)
     cmd.append(from_path)
     cmd.append(to_path)
@@ -395,7 +397,7 @@
         # exclude everything else under dists as the last rule.
         rsync_options += ('--exclude=dists/*',)
 
-    rsync(rsync_source, dest, rsync_options, log, timeout=3600)
+    rsync(rsync_source, dest, rsync_options, log, user='www-sync', timeout=3600)
 
 
 @backoff.on_exception(backoff.expo, CalledProcessError,
@@ -419,7 +421,7 @@
     # Sync just the root directory
     rsync_options = ('--links', '--perms', '--times', '--dirs', '--chmod=g+w',
                      '--delete', '--compress', '--link-dest=%s/' % link_dest)
-    rsync(source, dest, rsync_options, log, flags='--quiet', timeout=3600)
+    rsync(source, dest, rsync_options, log, flags='--quiet', user='www-sync', timeout=3600)
 
     # Check for file 'Archive-Update-in-Progress*' which signals
     # the need to sleep or try another IP