diff options
| author | Adam Coldrick <adam.coldrick@codethink.co.uk> | 2015-03-03 13:48:44 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-04-20 14:07:41 +0000 |
| commit | 602fda216c3cf77e8223541b5839e30b22878500 (patch) | |
| tree | 013a06d96e20b542ee991a027d63fc1f53b2c7d8 | |
| parent | b11df94094ae469646b6b85596068e478d9af54e (diff) | |
| download | morph-602fda216c3cf77e8223541b5839e30b22878500.tar.gz | |
gc: Make `morph gc` use the OSTree artifact cache
Change-Id: Ib2c8b0af414252acb5964eacae68f4dc692f85e3
| -rw-r--r-- | morphlib/plugins/gc_plugin.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/morphlib/plugins/gc_plugin.py b/morphlib/plugins/gc_plugin.py index 71522b04..54c1b43e 100644 --- a/morphlib/plugins/gc_plugin.py +++ b/morphlib/plugins/gc_plugin.py @@ -125,8 +125,8 @@ class GCPlugin(cliapp.Plugin): 'sufficient space already cleared', chatty=True) return - lac = morphlib.localartifactcache.LocalArtifactCache( - fs.osfs.OSFS(os.path.join(cache_path, 'artifacts'))) + lac = morphlib.ostreeartifactcache.OSTreeArtifactCache( + os.path.join(cache_path, 'artifacts')) max_age, min_age = self.calculate_delete_range() logging.debug('Must remove artifacts older than timestamp %d' % max_age) @@ -144,6 +144,8 @@ class GCPlugin(cliapp.Plugin): lac.remove(cachekey) removed += 1 + lac.prune() + # Maybe remove remaining middle-aged artifacts for cachekey in may_delete: if sufficient_free(): @@ -155,6 +157,7 @@ class GCPlugin(cliapp.Plugin): self.app.status(msg='Removing source %(cachekey)s', cachekey=cachekey, chatty=True) lac.remove(cachekey) + lac.prune() removed += 1 if sufficient_free(): |