src_prepare/euscan-ng
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

euscanwww/tasks: ungroup tasks for now, use immutables tasks

Browse Source 
There is a bug in celery preventing (group | group | task)() chains
to work. Was reported but not yet fixed.

Signed-off-by: Corentin Chary <corentin.chary@gmail.com>
This commit is contained in:
Corentin Chary
2012-08-07 08:46:05 +02:00
parent c2d9236d06
commit b03541c97d
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
euscanwww/djeuscan/tasks.py
View File

@@ -35,9 +35,10 @@ def group_one(task, seq, *args, **kwargs):
for elem in seq: for elem in seq:
if attr_name: if attr_name:
kwargs[attr_name] = elem kwargs[attr_name] = elem
tasks.append(task.subtask(args=args, kwargs=dict(kwargs))) tasks.append(task.subtask(args=list(args), kwargs=dict(kwargs), immutable=True))
else: else:
tasks.append(task.subtask(args=[elem] + list(args), kwargs=dict(kwargs))) tasks.append(task.subtask(args=[elem] + list(args), kwargs=dict(kwargs), immutable=True))
return group(tasks) return group(tasks)
@@ -48,7 +49,7 @@ def group_chunks(task, seq, n, *args, **kwargs):
tasks = [] tasks = []
for i in xrange(0, len(seq), n): for i in xrange(0, len(seq), n):
tasks.append( tasks.append(
task.subtask(args=[seq[i:i + n]] + list(args), kwargs=kwargs) task.subtask(args=[seq[i:i + n]] + list(args), kwargs=kwargs, immutable=True)
) )
return group(tasks) return group(tasks)
@@ -67,6 +68,7 @@ def update_counters(fast=False):
""" """
Updates counters Updates counters
""" """
logger = update_counters.get_logger() logger = update_counters.get_logger()
logger.info("Updating counters (fast=%s)...", fast) logger.info("Updating counters (fast=%s)...", fast)
misc.update_counters(fast=fast) misc.update_counters(fast=fast)
@@ -163,16 +165,26 @@ def update_portage_trees():
@task @task
def update_portage(packages=None): def update_portage(packages=None):
categories = portage.settings.categories
""" Workaround for celery bug when chaining groups """
update_portage_trees()
scan_portage(packages=[], purge_packages=True, purge_versions=True, prefetch=True)
scan_metadata(packages=[], populate=True)
update_counters(fast=False)
""" Currently broken
update_portage_trees() update_portage_trees()
scan_metadata(packages=None, populate=True) scan_metadata(packages=None, populate=True)
( (
group_one(scan_portage, portage.settings.categories, group_one(scan_portage, categories,
attr_name="category", purge_packages=True, attr_name="category", purge_packages=True,
purge_versions=True, prefetch=True) | purge_versions=True, prefetch=True) |
group_one(scan_metadata, portage.settings.categories, group_one(scan_metadata, categories,
attr_name="category") | attr_name="category") |
update_counters.si(fast=False) update_counters.si(fast=True)
)() )()
"""
return True return True