Lubuntu/britney2-ubuntu
8
0
Fork 0
mirror of https://git.launchpad.net/~ubuntu-release/britney/+git/britney2-ubuntu synced 2025-06-06 23:31:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

britney.py: Optimise scheduling a bit

Browse Source 
Avoid rescheduling the tail of packages if we can avoid it.

Signed-off-by: Niels Thykier <niels@thykier.net>
This commit is contained in:
Niels Thykier 2016-04-08 18:02:19 +00:00
parent ac66e3118d
commit a4daee0866
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
britney.py
View File

@ -2178,8 +2178,8 @@ class Britney(object):
final result is successful, otherwise (None, []). final result is successful, otherwise (None, []).
""" """
group_info = {} group_info = {}
maybe_rescheduled = packages rescheduled_packages = packages
changed = True maybe_rescheduled_packages = []
for y in sorted((y for y in packages), key=attrgetter('uvname')): for y in sorted((y for y in packages), key=attrgetter('uvname')):
updates, rms, _ = self._compute_groups(y.package, y.suite, y.architecture, y.is_removal) updates, rms, _ = self._compute_groups(y.package, y.suite, y.architecture, y.is_removal)
@ -2196,11 +2196,10 @@ class Britney(object):
nuninst_last_accepted = nuninst_orig nuninst_last_accepted = nuninst_orig
self.output_write("recur: [] %s %d/0\n" % (",".join(x.uvname for x in selected), len(packages))) self.output_write("recur: [] %s %d/0\n" % (",".join(x.uvname for x in selected), len(packages)))
while changed: while rescheduled_packages:
changed = False groups = {group_info[x] for x in rescheduled_packages}
groups = {group_info[x] for x in maybe_rescheduled}
worklist = self._inst_tester.solve_groups(groups) worklist = self._inst_tester.solve_groups(groups)
maybe_rescheduled = [] rescheduled_packages = []
worklist.reverse() worklist.reverse()
@ -2211,7 +2210,6 @@ class Britney(object):
accepted, nuninst_after, comp_undo, failed_arch = self.try_migration(comp, nuninst_last_accepted, lundo) accepted, nuninst_after, comp_undo, failed_arch = self.try_migration(comp, nuninst_last_accepted, lundo)
if accepted: if accepted:
selected.extend(comp) selected.extend(comp)
changed = True
if lundo is not None: if lundo is not None:
lundo.extend(comp_undo) lundo.extend(comp_undo)
self.output_write("accepted: %s\n" % comp_name) self.output_write("accepted: %s\n" % comp_name)
@ -2223,6 +2221,8 @@ class Britney(object):
else: else:
self.output_write(" most: (%d) .. %s\n" % (len(selected), " ".join(x.uvname for x in selected[-20:]))) self.output_write(" most: (%d) .. %s\n" % (len(selected), " ".join(x.uvname for x in selected[-20:])))
nuninst_last_accepted = nuninst_after nuninst_last_accepted = nuninst_after
rescheduled_packages.extend(maybe_rescheduled_packages)
maybe_rescheduled_packages.clear()
else: else:
broken = sorted(b for b in nuninst_after[failed_arch] broken = sorted(b for b in nuninst_after[failed_arch]
if b not in nuninst_last_accepted[failed_arch]) if b not in nuninst_last_accepted[failed_arch])
@ -2230,7 +2230,8 @@ class Britney(object):
if any(item for item in comp if item.architecture != 'source'): if any(item for item in comp if item.architecture != 'source'):
compare_nuninst = nuninst_last_accepted compare_nuninst = nuninst_last_accepted
# NB: try_migration already reverted this for us, so just print the results and move on # NB: try_migration already reverted this for us, so just print the results and move on
self.output_write("skipped: %s (%d, %d)\n" % (comp_name, len(maybe_rescheduled), len(worklist))) self.output_write("skipped: %s (%d, %d, %d)\n" % (comp_name, len(rescheduled_packages),
len(maybe_rescheduled_packages), len(worklist)))
self.output_write(" got: %s\n" % (self.eval_nuninst(nuninst_after, compare_nuninst))) self.output_write(" got: %s\n" % (self.eval_nuninst(nuninst_after, compare_nuninst)))
self.output_write(" * %s: %s\n" % (failed_arch, ", ".join(broken))) self.output_write(" * %s: %s\n" % (failed_arch, ", ".join(broken)))
@ -2238,7 +2239,7 @@ class Britney(object):
self.output_write(" - splitting the component into single items and retrying them\n") self.output_write(" - splitting the component into single items and retrying them\n")
worklist.extend([item] for item in comp) worklist.extend([item] for item in comp)
else: else:
maybe_rescheduled.append(comp[0]) maybe_rescheduled_packages.append(comp[0])
self.output_write(" finish: [%s]\n" % ",".join( x.uvname for x in selected )) self.output_write(" finish: [%s]\n" % ",".join( x.uvname for x in selected ))
self.output_write("endloop: %s\n" % (self.eval_nuninst(self.nuninst_orig))) self.output_write("endloop: %s\n" % (self.eval_nuninst(self.nuninst_orig)))
@ -2247,7 +2248,7 @@ class Britney(object):
newly_uninst(self.nuninst_orig, nuninst_last_accepted))) newly_uninst(self.nuninst_orig, nuninst_last_accepted)))
self.output_write("\n") self.output_write("\n")
return (nuninst_last_accepted, maybe_rescheduled) return (nuninst_last_accepted, maybe_rescheduled_packages)
def do_all(self, hinttype=None, init=None, actions=None): def do_all(self, hinttype=None, init=None, actions=None):