yudaike/openSUSE-release-tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1280 from jberry-suse/cycles-clean-and-drop-cache

Browse Source 
osclib/cycles: only cache target project build graph to avoid excessive cache.
This commit is contained in:
Ludwig Nussel 2017-12-01 15:51:26 +01:00 committed by GitHub
commit 91fb069b78
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osclib/cache.py
View File

@ -66,10 +66,13 @@ class Cache(object):
CACHE_DIR = os.path.expanduser('~/.cache/osc-plugin-factory')
TTL_LONG = 12 * 60 * 60
TTL_MEDIUM = 30 * 60
TTL_SHORT = 5 * 60
TTL_DUPLICATE = 3
PATTERNS = {
'/build/[^/]+/_result': TTL_DUPLICATE,
# For cycles when run via repo-checker cache non-stagings.
'/build/(?:[^/](?!:Staging:))+/[^/]+/[^/]+/_builddepinfo$': TTL_MEDIUM,
# Group members cannot be guaranteed, but change rarely.
'/group/[^/?]+$': TTL_SHORT,
# Clear target project cache upon request acceptance.

14
osclib/cycle.py
View File

@ -150,7 +150,6 @@ class CycleDetector(object):
# Store packages prevoiusly ignored. Don't pollute the screen.
self._ignore_packages = set()
@memoize(ttl=60*60*6)
def _builddepinfo(self, project, repository, arch):
root = None
try:
@ -161,13 +160,6 @@ class CycleDetector(object):
print('ERROR in URL %s [%s]' % (url, e))
return root
def _get_builddepinfo(self, project, repository, arch, package):
"""Get the builddep info for a single package"""
root = ET.fromstring(self._builddepinfo(project, repository, arch))
packages = [Package(element=e) for e in root.findall('package')]
package = [p for p in packages if p.pkg == package]
return package[0] if package else None
def _get_builddepinfo_graph(self, project, repository, arch):
"""Generate the buildepinfo graph for a given architecture."""
@ -210,12 +202,6 @@ class CycleDetector(object):
graph.subpkgs = subpkgs
return graph
def _get_builddepinfo_cycles(self, package, repository, arch):
"""Generate the buildepinfo cycle list for a given architecture."""
root = ET.fromstring(self._builddepinfo(package, repository, arch))
return frozenset(frozenset(e.text for e in cycle.findall('package'))
for cycle in root.findall('cycle'))
def cycles(self, staging, project=None, repository='standard', arch='x86_64'):
"""Detect cycles in a specific repository."""