Merge lp:~hloeung/ubuntu-repository-cache/logging-ubuntu_active-plus-keeps into lp:ubuntu-repository-cache

[Haw Loeung]

Check and ensure metadata to be removed isn't ubuntu_active - LP:1799595

Also log what ubuntu_active points at and the list of directories to keep, if provided.

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

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

[lp:~hloeung/ubuntu-repository-cache/logging-ubuntu_active-plus-keeps]

298. By Haw Loeung on 2021-01-08

Double check and ensure it isn't what ubuntu_active points at - LP:1799595

[Colin Misare (cmisare)]

Seems good to me

review: Approve

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

Change successfully merged at revision 296

=== modified file 'lib/ubuntu_repository_cache/metadata_sync.py'
--- lib/ubuntu_repository_cache/metadata_sync.py	2020-10-13 04:08:14 +0000
+++ lib/ubuntu_repository_cache/metadata_sync.py	2021-01-08 04:19:31 +0000
@@ -329,6 +329,9 @@
         active = os.path.realpath('/'.join((apache_data, 'ubuntu_active')))
         canary = '_'.join((active, 'good'))
         keep = set((active, canary))
+        log('ubuntu_active currently points at: {}'.format(active))
+    else:
+        log('Keeping list provided: {}'.format(', '.join(keep)))
 
     glob_path = '/'.join((apache_data, '/ubuntu_[0-9]*'))
 
@@ -345,7 +348,12 @@
 
     for entry in [os.path.realpath(p) for p in glob.glob(glob_path)]:
         if entry not in keep:
-            if os.path.isfile(entry):
+            # We want to make sure it isn't the directory
+            # ubuntu_active points to (LP#1799595).
+            active = os.path.realpath('/'.join((apache_data, 'ubuntu_active')))
+            if entry == active:
+                log('ubuntu_active points to {}, skipping'.format(entry))
+            elif os.path.isfile(entry):
                 # XXX: Should be a debug
                 log('Removing file {}'.format(entry))
                 os.remove(entry)