Merge pull request #2438 from ryanpetrello/dispatcher-quit-race

don't attempt to recover special QUIT messages in the worker pool recovery code

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]

awx/main/dispatch/pool.py

@@ -145,7 +145,9 @@ class PoolWorker(object):
             # if this process has any pending messages requeue them
             for _ in range(self.qsize):
                 try:
-                    orphaned.append(self.queue.get(block=False))
+                    message = self.queue.get(block=False)
+                    if message != 'QUIT':
+                        orphaned.append(message)
                 except QueueEmpty:
                     break  # qsize is not always _totally_ up to date
             if len(orphaned):
@@ -328,6 +330,7 @@ class AutoscalePool(WorkerPool):
                 #    send them to another worker
                 logger.error('worker pid:{} is gone (exit={})'.format(w.pid, w.exitcode))
                 if w.current_task:
+                    if w.current_task != 'QUIT':
                         try:
                             for j in UnifiedJob.objects.filter(celery_task_id=w.current_task['uuid']):
                                 reaper.reap_job(j, 'failed')