concurrency issues cropped up with object locking

This makes things slow but right.  Adjusting CC's on a
ticket cannot be done in parallel without some race condition
risk of inaccuracy.

4 files changed, 22 insertions, 23 deletions

diff --git a/bugzilla_populate_user_relations_comments_table.py b/bugzilla_populate_user_relations_comments_table.py
index b596410..7798625 100755
--- a/bugzilla_populate_user_relations_comments_table.py
+++ b/bugzilla_populate_user_relations_comments_table.py
@@ -94,11 +94,11 @@ def run_populate(bugid, tries=1):
 
 def main():
     bugs = return_bug_list()
-    from multiprocessing import Pool
-    pool = Pool(processes=int(config.bz_populate_multi))
-    _ =  pool.map(run_populate, bugs)
-    complete = len(filter(bool, _))
-    failed = len(_) - complete
+    result = []
+    for b in bugs:
+        result.append(run_populate(b))
+    complete = len(filter(bool, result))
+    failed = len(result) - complete
     print '%s completed %s, failed %s' % (sys.argv[0], complete, failed)
 
 if __name__ == '__main__':
diff --git a/bugzilla_populate_user_relations_table.py b/bugzilla_populate_user_relations_table.py
index d7fbaf7..ebbf11b 100755
--- a/bugzilla_populate_user_relations_table.py
+++ b/bugzilla_populate_user_relations_table.py
@@ -172,11 +172,11 @@ def run_populate(bugid, tries=1):
 
 def main():
     bugs = return_bug_list()
-    from multiprocessing import Pool
-    pool = Pool(processes=int(config.bz_populate_multi))
-    _ =  pool.map(run_populate, bugs)
-    complete = len(filter(bool, _))
-    failed = len(_) - complete
+    result = []
+    for b in bugs:
+        result.append(run_populate(b))
+    complete = len(filter(bool, result))
+    failed = len(result) - complete
     print '%s completed %s, failed %s' % (sys.argv[0], complete, failed)
 
 if __name__ == '__main__':
diff --git a/bugzilla_update_user_comments.py b/bugzilla_update_user_comments.py
index bff2192..b3009e6 100755
--- a/bugzilla_update_user_comments.py
+++ b/bugzilla_update_user_comments.py
@@ -78,7 +78,7 @@ def update(user):
         log('%s user does not exist to update' % (user['user']))
         return False
     pmig.close()
-    log(util.purge_cache())
+    #log(util.purge_cache())
     return True
 
 def run_update(user, tries=1):
@@ -182,13 +182,12 @@ def main():
                                 starting_epoch,
                                 user_count, issue_count, pmig)
 
+    results = []
+    for h in histories:
+        results.append(run_update(h))
+    complete = len(filter(bool, results))
+    failed = len(results) - complete
 
-    from multiprocessing import Pool
-
-    pool = Pool(processes=int(config.bz_updatemulti))
-    _ =  pool.map(run_update, histories)
-    complete = len(filter(bool, _))
-    failed = len(_) - complete
     phabdb.user_relations_finish(pid,
                                  int(time.time()),
                                  ipriority['update_success'],
@@ -198,7 +197,7 @@ def main():
                                  pmig)
 
     pm = phabmacros(config.phab_user, config.phab_cert, config.phab_host)
-    vlog(util.update_blog(source, complete, failed, user_count, issue_count, pm))
+    #vlog(util.update_blog(source, complete, failed, user_count, issue_count, pm))
 
     pmig.close()
     print '%s completed %s, failed %s' % (sys.argv[0], complete, failed)
diff --git a/bugzilla_update_user_header.py b/bugzilla_update_user_header.py
index cf38607..ab5d409 100755
--- a/bugzilla_update_user_header.py
+++ b/bugzilla_update_user_header.py
@@ -181,12 +181,12 @@ def main():
                                 starting_epoch,
                                 user_count, issue_count, pmig)
 
+    results = []
+    for h in histories:
+        results.append(run_update(h))
+    complete = len(filter(bool, results))
+    failed = len(results) - complete
 
-    from multiprocessing import Pool
-    pool = Pool(processes=int(config.bz_updatemulti))
-    _ =  pool.map(run_update, histories)
-    complete = len(filter(bool, _))
-    failed = len(_) - complete
     phabdb.user_relations_finish(pid,
                                  int(time.time()),
                                  ipriority['update_success'],