From 1d8bc3e33a03b79bd54c46b690d1eb2b5de80b62 Mon Sep 17 00:00:00 2001
From: Jan Kaluza <jkaluza@redhat.com>
Date: Mon, 20 Feb 2017 14:36:11 +0100
Subject: [PATCH] Use concurrent.futures instead of our own ThreadPool
 implementation

---
 Dockerfile                    |  1 +
 Vagrantfile                   |  1 +
 module_build_service/utils.py | 57 +++--------------------------------
 requirements.txt              |  1 +
 4 files changed, 7 insertions(+), 53 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 470b9a9f..495aa101 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,6 +13,7 @@ RUN dnf install -y \
         python-mock \
         python-pip \
         python-qpid \
+        python-futures \
         python2-cffi \
         python2-cryptography \
         python2-pdc-client \
diff --git a/Vagrantfile b/Vagrantfile
index 6317bef6..98d58b47 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -25,6 +25,7 @@ $script = <<SCRIPT
         python-mock \
         python-qpid \
         python-virtualenv \
+        python-futures \
         redhat-rpm-config \
         redhat-rpm-config \
         rpm-build \
diff --git a/module_build_service/utils.py b/module_build_service/utils.py
index 8b7c5a04..7f3e0bee 100644
--- a/module_build_service/utils.py
+++ b/module_build_service/utils.py
@@ -41,57 +41,8 @@ from module_build_service import conf, db
 from module_build_service.errors import (Unauthorized, Conflict)
 import module_build_service.messaging
 from multiprocessing.dummy import Pool as ThreadPool
-from six.moves.queue import Queue
-from threading import Thread
 
-class Worker(Thread):
-    """ Thread executing tasks from a given tasks queue """
-    def __init__(self, tasks):
-        Thread.__init__(self)
-        self.tasks = tasks
-        self.daemon = True
-        self.start()
-
-    def run(self):
-        while True:
-            task_data = self.tasks.get()
-            if task_data == StopIteration:
-                self.tasks.task_done()
-                break
-
-            func, args, kargs = task_data
-            try:
-                func(*args, **kargs)
-            except Exception as e:
-                # An exception happened in this thread
-                log.exception("An exception happened in a worker thread.")
-            finally:
-                # Mark this task as done, whether an exception happened or not
-                self.tasks.task_done()
-
-
-class QueueBasedThreadPool:
-    """ Pool of threads consuming tasks from a queue. """
-    def __init__(self, num_threads):
-        self.num_threads = num_threads
-        self.tasks = Queue(num_threads)
-        for _ in range(num_threads):
-            Worker(self.tasks)
-
-    def add_task(self, func, *args, **kargs):
-        """ Add a task to the queue """
-        self.tasks.put((func, args, kargs))
-
-    def map(self, func, args_list):
-        """ Add a list of tasks to the queue """
-        for args in args_list:
-            self.add_task(func, args)
-
-    def wait_completion(self):
-        """ Wait for completion of all the tasks in the queue """
-        for _ in range(self.num_threads):
-            self.tasks.put(StopIteration)
-        self.tasks.join()
+import concurrent.futures
 
 def retry(timeout=conf.net_timeout, interval=conf.net_retry_interval, wait_on=Exception):
     """ A decorator that allows to retry a section of code...
@@ -209,9 +160,9 @@ def start_build_batch(config, module, session, builder, components=None):
             return
 
     # Start build of components in this batch.
-    pool = QueueBasedThreadPool(config.num_consecutive_builds)
-    pool.map(start_build_component, unbuilt_components)
-    pool.wait_completion()
+    with concurrent.futures.ThreadPoolExecutor(max_workers=config.num_consecutive_builds) as executor:
+        futures = {executor.submit(start_build_component, c): c for c in unbuilt_components}
+        concurrent.futures.wait(futures)
 
     further_work = []
 
diff --git a/requirements.txt b/requirements.txt
index 8c2c959b..4fb569c7 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -19,3 +19,4 @@ python-fedora
 qpid-python
 six
 sqlalchemy
+futures # Python 2 only