From: Mark Hymers Date: Sun, 27 Mar 2011 09:28:14 +0000 (+0100) Subject: Run linearly until we can debug why the multiprocessing stuff hangs X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=452673ed0ed455adc46eae17a073df6466892cd4;p=dak Run linearly until we can debug why the multiprocessing stuff hangs Signed-off-by: Mark Hymers --- diff --git a/dak/generate_filelist.py b/dak/generate_filelist.py index f82cc859..928a62d4 100755 --- a/dak/generate_filelist.py +++ b/dak/generate_filelist.py @@ -159,7 +159,7 @@ def main(): Options = cnf.SubTree("Filelist::Options") if Options['Help']: usage() - pool = Pool() + #pool = Pool() query_suites = query_suites. \ filter(Suite.suite_name.in_(utils.split_args(Options['Suite']))) query_components = query_components. \ @@ -179,24 +179,29 @@ def main(): if architecture not in suite.architectures: pass elif architecture.arch_string == 'source': - pool.apply_async(writeSourceList, - (suite_id, component_id, Options['Incremental']), callback=log) + log(writeSourceList(suite_id, component_id, Options['Incremental'])) + #pool.apply_async(writeSourceList, + # (suite_id, component_id, Options['Incremental']), callback=log) elif architecture.arch_string == 'all': - pool.apply_async(writeAllList, - (suite_id, component_id, architecture_id, 'deb', - Options['Incremental']), callback=log) - pool.apply_async(writeAllList, - (suite_id, component_id, architecture_id, 'udeb', - Options['Incremental']), callback=log) + log(writeAllList, suite_id, component_id, 'deb', Options['Incremental']) + #pool.apply_async(writeAllList, + # (suite_id, component_id, architecture_id, 'deb', + # Options['Incremental']), callback=log) + log(writeAllList, suite_id, component_id, 'udeb', Options['Incremental']) + #pool.apply_async(writeAllList, + # (suite_id, component_id, architecture_id, 'udeb', + # Options['Incremental']), callback=log) else: # arch any - pool.apply_async(writeBinaryList, - (suite_id, component_id, architecture_id, 'deb', - Options['Incremental']), callback=log) - pool.apply_async(writeBinaryList, - (suite_id, component_id, architecture_id, 'udeb', - Options['Incremental']), callback=log) - pool.close() - pool.join() + log(writeBinaryList, suite_id, component_id, architecture_id, 'deb', Options['Incremental']) + #pool.apply_async(writeBinaryList, + # (suite_id, component_id, architecture_id, 'deb', + # Options['Incremental']), callback=log) + log(writeBinaryList, suite_id, component_id, architecture_id, 'udeb', Options['Incremental']) + #pool.apply_async(writeBinaryList, + # (suite_id, component_id, architecture_id, 'udeb', + # Options['Incremental']), callback=log) + #pool.close() + #pool.join() # this script doesn't change the database session.close() diff --git a/dak/generate_packages_sources2.py b/dak/generate_packages_sources2.py index f055aa56..e9128ac8 100755 --- a/dak/generate_packages_sources2.py +++ b/dak/generate_packages_sources2.py @@ -266,18 +266,21 @@ def main(): def log(details): logger.log(details) - pool = Pool() + #pool = Pool() for s in suites: if s.untouchable and not force: utils.fubar("Refusing to touch %s (untouchable and not forced)" % s.suite_name) for c in component_ids: - pool.apply_async(generate_sources, [s.suite_id, c], callback=log) + log(generate_sources(s.suite_id, c)) + #pool.apply_async(generate_sources, [s.suite_id, c], callback=log) for a in s.architectures: - pool.apply_async(generate_packages, [s.suite_id, c, a.arch_id, 'deb'], callback=log) - pool.apply_async(generate_packages, [s.suite_id, c, a.arch_id, 'udeb'], callback=log) + log(generate_sources(s.suite_id, c, a.arch_id, 'deb')) + #pool.apply_async(generate_packages, [s.suite_id, c, a.arch_id, 'deb'], callback=log) + log(generate_sources(s.suite_id, c, a.arch_id, 'udeb')) + #pool.apply_async(generate_packages, [s.suite_id, c, a.arch_id, 'udeb'], callback=log) - pool.close() - pool.join() + #pool.close() + #pool.join() # this script doesn't change the database session.close()