mirror of
https://git.launchpad.net/~ubuntu-release/britney/+git/britney2-ubuntu
synced 2025-04-07 17:21:22 +00:00
Optimise checking of affected packages
For (non-hint) migrations, split the set of affected into two parts; one for reverse dependencies and one "negative dependencies" (e.g. Conflicts). If there are only regressions in the nuninst after checking the first set, then there is no reason to continue with the second set (as "negative dependencies" can only make it worse at that point). Signed-off-by: Niels Thykier <niels@thykier.net>
This commit is contained in:
Niels Thykier
parent
a4daee0866
commit
ec37bd06aa
55
britney.py
55
britney.py
@ -1945,7 +1945,8 @@ class Britney(object):
|
||||
"""
|
||||
undo = {'binaries': {}, 'sources': {}, 'virtual': {}, 'nvirtual': []}
|
||||
|
||||
affected = set()
|
||||
affected_pos = set()
|
||||
affected_remain = set()
|
||||
|
||||
# local copies for better performance
|
||||
sources = self.sources
|
||||
@ -1993,8 +1994,8 @@ class Britney(object):
|
||||
if pkey not in eqv_set:
|
||||
# all the reverse dependencies are affected by
|
||||
# the change
|
||||
affected.update(inst_tester.reverse_dependencies_of(rm_pkg_id))
|
||||
affected.update(inst_tester.negative_dependencies_of(rm_pkg_id))
|
||||
affected_pos.update(inst_tester.reverse_dependencies_of(rm_pkg_id))
|
||||
affected_remain.update(inst_tester.negative_dependencies_of(rm_pkg_id))
|
||||
|
||||
# remove the provided virtual packages
|
||||
for j, prov_version, _ in pkg_data.provides:
|
||||
@ -2022,7 +2023,7 @@ class Britney(object):
|
||||
version = binaries_t_a[item.package].version
|
||||
pkg_id = (item.package, version, item.architecture)
|
||||
undo['binaries'][(item.package, item.architecture)] = pkg_id
|
||||
affected.update(inst_tester.reverse_dependencies_of(pkg_id))
|
||||
affected_pos.update(inst_tester.reverse_dependencies_of(pkg_id))
|
||||
del binaries_t_a[item.package]
|
||||
inst_tester.remove_testing_binary(pkg_id)
|
||||
|
||||
@ -2037,8 +2038,8 @@ class Britney(object):
|
||||
equivalent_replacement = key in eqv_set
|
||||
|
||||
# obviously, added/modified packages are affected
|
||||
if not equivalent_replacement and updated_pkg_id not in affected:
|
||||
affected.add(updated_pkg_id)
|
||||
if not equivalent_replacement:
|
||||
affected_pos.add(updated_pkg_id)
|
||||
# if the binary already exists in testing, it is currently
|
||||
# built by another source package. we therefore remove the
|
||||
# version built by the other source package, after marking
|
||||
@ -2051,8 +2052,8 @@ class Britney(object):
|
||||
undo['binaries'][key] = old_pkg_id
|
||||
if not equivalent_replacement:
|
||||
# all the reverse conflicts
|
||||
affected.update(inst_tester.reverse_dependencies_of(old_pkg_id))
|
||||
affected.update(inst_tester.negative_dependencies_of(old_pkg_id))
|
||||
affected_pos.update(inst_tester.reverse_dependencies_of(old_pkg_id))
|
||||
affected_remain.update(inst_tester.negative_dependencies_of(old_pkg_id))
|
||||
inst_tester.remove_testing_binary(old_pkg_id)
|
||||
elif hint_undo:
|
||||
# the binary isn't in testing, but it may have been at
|
||||
@ -2068,7 +2069,7 @@ class Britney(object):
|
||||
for (tundo, tpkg) in hint_undo:
|
||||
if key in tundo['binaries']:
|
||||
tpkg_id = tundo['binaries'][key]
|
||||
affected.update(inst_tester.reverse_dependencies_of(tpkg_id))
|
||||
affected_pos.update(inst_tester.reverse_dependencies_of(tpkg_id))
|
||||
|
||||
# add/update the binary package from the source suite
|
||||
new_pkg_data = packages_s[parch][0][binary]
|
||||
@ -2085,17 +2086,18 @@ class Britney(object):
|
||||
provides_t_a[j].add((binary, prov_version))
|
||||
if not equivalent_replacement:
|
||||
# all the reverse dependencies are affected by the change
|
||||
affected.add(updated_pkg_id)
|
||||
affected.update(inst_tester.negative_dependencies_of(updated_pkg_id))
|
||||
affected_pos.add(updated_pkg_id)
|
||||
affected_remain.update(inst_tester.negative_dependencies_of(updated_pkg_id))
|
||||
|
||||
# add/update the source package
|
||||
if item.architecture == 'source':
|
||||
sources['testing'][item.package] = sources[item.suite][item.package]
|
||||
|
||||
# Also include the transitive rdeps of the packages found so far
|
||||
compute_reverse_tree(inst_tester, affected)
|
||||
compute_reverse_tree(inst_tester, affected_pos)
|
||||
compute_reverse_tree(inst_tester, affected_remain)
|
||||
# return the package name, the suite, the list of affected packages and the undo dictionary
|
||||
return (affected, undo)
|
||||
return (affected_pos, affected_remain, undo)
|
||||
|
||||
def try_migration(self, actions, nuninst_now, lundo=None, automatic_revert=True):
|
||||
is_accepted = True
|
||||
@ -2111,7 +2113,7 @@ class Britney(object):
|
||||
if len(actions) == 1:
|
||||
item = actions[0]
|
||||
# apply the changes
|
||||
affected, undo = self.doop_source(item, hint_undo=lundo)
|
||||
affected_pos, affected_remain, undo = self.doop_source(item, hint_undo=lundo)
|
||||
undo_list = [(undo, item)]
|
||||
if item.architecture == 'source':
|
||||
affected_architectures = set(self.options.architectures)
|
||||
@ -2120,7 +2122,8 @@ class Britney(object):
|
||||
else:
|
||||
undo_list = []
|
||||
removals = set()
|
||||
affected = set()
|
||||
affected_pos = set()
|
||||
affected_remain = set()
|
||||
for item in actions:
|
||||
_, rms, _ = self._compute_groups(item.package, item.suite,
|
||||
item.architecture,
|
||||
@ -2133,12 +2136,23 @@ class Britney(object):
|
||||
affected_architectures = set(self.options.architectures)
|
||||
|
||||
for item in actions:
|
||||
item_affected, undo = self.doop_source(item,
|
||||
hint_undo=lundo,
|
||||
removals=removals)
|
||||
affected.update(item_affected)
|
||||
item_affected_pos, item_affected_remain, undo = self.doop_source(item,
|
||||
hint_undo=lundo,
|
||||
removals=removals)
|
||||
affected_pos.update(item_affected_pos)
|
||||
affected_remain.update(item_affected_remain)
|
||||
undo_list.append((undo, item))
|
||||
|
||||
# Optimise the test if we may revert directly.
|
||||
# - The automatic-revert is needed since some callers (notably via hints) may
|
||||
# accept the outcome of this migration and expect nuninst to be updated.
|
||||
# (e.g. "force-hint" or "hint")
|
||||
if automatic_revert:
|
||||
affected_remain -= affected_pos
|
||||
else:
|
||||
affected_remain |= affected_pos
|
||||
affected_pos = set()
|
||||
|
||||
# Copy nuninst_comp - we have to deep clone affected
|
||||
# architectures.
|
||||
|
||||
@ -2152,7 +2166,8 @@ class Britney(object):
|
||||
for arch in affected_architectures:
|
||||
check_archall = arch in nobreakall_arches
|
||||
|
||||
check_installability(self._inst_tester, packages_t, arch, affected, check_archall, nuninst_after)
|
||||
check_installability(self._inst_tester, packages_t, arch, affected_pos, affected_remain,
|
||||
check_archall, nuninst_after)
|
||||
|
||||
# if the uninstallability counter is worse than before, break the loop
|
||||
if automatic_revert and len(nuninst_after[arch]) > len(nuninst_now[arch]):
|
||||
|
||||
@ -538,25 +538,66 @@ def test_installability(inst_tester, pkg_name, pkg_id, broken, nuninst_arch):
|
||||
If nuninst_arch is not None then it also updated in the same
|
||||
way as broken is.
|
||||
"""
|
||||
c = 0
|
||||
r = inst_tester.is_installable(pkg_id)
|
||||
if not r:
|
||||
# not installable
|
||||
if pkg_name not in broken:
|
||||
# regression
|
||||
broken.add(pkg_name)
|
||||
c = -1
|
||||
if nuninst_arch is not None and pkg_name not in nuninst_arch:
|
||||
nuninst_arch.add(pkg_name)
|
||||
else:
|
||||
if pkg_name in broken:
|
||||
# Improvement
|
||||
broken.remove(pkg_name)
|
||||
c = 1
|
||||
if nuninst_arch is not None and pkg_name in nuninst_arch:
|
||||
nuninst_arch.remove(pkg_name)
|
||||
return c
|
||||
|
||||
|
||||
def check_installability(inst_tester, binaries, arch, affected, check_archall, nuninst):
|
||||
def check_installability(inst_tester, binaries, arch, updates, affected, check_archall, nuninst):
|
||||
broken = nuninst[arch + "+all"]
|
||||
packages_t_a = binaries[arch][0]
|
||||
improvement = 0
|
||||
|
||||
# broken packages (first round)
|
||||
for pkg_id in (x for x in updates if x[2] == arch):
|
||||
name, version, parch = pkg_id
|
||||
if name not in packages_t_a:
|
||||
continue
|
||||
pkgdata = packages_t_a[name]
|
||||
if version != pkgdata.version:
|
||||
# Not the version in testing right now, ignore
|
||||
continue
|
||||
actual_arch = pkgdata.architecture
|
||||
nuninst_arch = None
|
||||
# only check arch:all packages if requested
|
||||
if check_archall or actual_arch != 'all':
|
||||
nuninst_arch = nuninst[parch]
|
||||
elif actual_arch == 'all':
|
||||
nuninst[parch].discard(name)
|
||||
result = test_installability(inst_tester, name, pkg_id, broken, nuninst_arch)
|
||||
if improvement > 0 or not result:
|
||||
# Any improvement could in theory fix all of its rdeps, so
|
||||
# stop updating "improvement" after that.
|
||||
continue
|
||||
if result > 0:
|
||||
# Any improvement (even in arch:all packages) could fix any
|
||||
# number of rdeps
|
||||
improvement = 1
|
||||
continue
|
||||
if check_archall or actual_arch != 'all':
|
||||
# We cannot count arch:all breakage (except on no-break-arch-all arches)
|
||||
# because the nuninst check do not consider them regressions.
|
||||
improvement += result
|
||||
|
||||
if improvement < 0:
|
||||
# The early round is sufficient to disprove the situation
|
||||
return
|
||||
|
||||
for pkg_id in (x for x in affected if x[2] == arch):
|
||||
name, version, parch = pkg_id
|
||||
if name not in packages_t_a:
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user