Propagate task error from pool threads pool workers

rdiff_backup/pool.py

@@ -23,13 +23,10 @@ import Queue
 import itertools
 import threading
 
-Job = namedtuple('Job', ['func', 'iterable', 'outqueue'])
-Task = namedtuple('Task', ['func', 'args', 'index', 'outqueue'])
+Job = namedtuple('Job', ['func', 'iterable', 'outqueue', 'options'])
+Task = namedtuple('Task', ['func', 'args', 'index', 'outqueue', 'options'])
 Result = namedtuple('Result', ['index', 'value'])
 
-RUNNING = 0
-STOPPED = 1
-
 
 def worker(taskqueue):
 	while True:
@@ -42,7 +39,10 @@ def worker(taskqueue):
 			# It means this task was the last of an iterable job
 			result = None
 		else:
-			value = task.func(*task.args)
+			try:
+				value = task.func(*task.args)
+			except Exception as e:
+				value = e
 			result = Result(task.index, value)
 
 		task.outqueue.put(result, block=True)
@@ -57,8 +57,6 @@ class Pool(object):
 			processes = cpu_count()
 		self.processes = processes
 
-		self.state = STOPPED
-
 		# Init queues
 		self.taskqueue = Queue.Queue(maxsize=max_taskqueue_size)
 		self.jobqueue = Queue.Queue(maxsize=max_jobqueue_size)
@@ -88,25 +86,25 @@ class Pool(object):
 
 		return thread
 
-	def create_job(self, func, iterable, max_outqueue_size=0):
+	def create_job(self, func, iterable, **options):
+		max_outqueue_size = options.pop('max_outqueue_size', 0)
 		outqueue = Queue.Queue(maxsize=max_outqueue_size)
 
-		job = Job(func, iterable, outqueue)
+		job = Job(func, iterable, outqueue, options)
 		self.jobqueue.put(job)
 
 		return job
 
 
-	def imap(self, func, iterable, max_outqueue_size=0):
+	def imap(self, func, iterable, **options):
 		iterable = itertools.imap(None, iterable)
 
-		job = self.create_job(func, iterable,
-							  max_outqueue_size=max_outqueue_size)
+		job = self.create_job(func, iterable, **options)
 
 		return IMapIterator(job.outqueue)
 
-	def apply(self, func, *args):
-		job = self.create_job(func, [args])
+	def apply(self, func, *args, **options):
+		job = self.create_job(func, [args], **options)
 
 		return AsyncResult(job.outqueue)
 
@@ -128,9 +126,9 @@ class Pool(object):
 				break
 
 			for (index, args) in enumerate(job.iterable):
-				task = Task(job.func, args, index, job.outqueue)
+				task = Task(job.func, args, index, job.outqueue, job.options)
 				taskqueue.put(task, block=True)
-			taskqueue.put(Task(None, None, None, job.outqueue), block=True)
+			taskqueue.put(Task(None, None, None, job.outqueue, job.options), block=True)
 
 			jobqueue.task_done()
 
@@ -151,6 +149,8 @@ class IMapIterator(object):
 				result = self.outqueue.get(True)
 				if result is None:
 					raise StopIteration()
+				if isinstance(result.value, Exception):
+					raise result.value
 
 			if result.index != self.index:
 				self.results[result.index] = result