Merge "Use wait for empty update queue before accepting merges"

2019-08-08 20:33:09 +00:00 · 2019-08-08 20:33:09 +00:00 · d97ea8ebda
parent b9a607beb3 553cca4e03
commit d97ea8ebda
1 changed files with 3 additions and 1 deletions
--- a/zuul/executor/server.py
+++ b/zuul/executor/server.py
@ -2427,7 +2427,9 @@ class ExecutorServer(object):
            'zuul.ExecutorServer',
            'merger',
            self.config,
-            self.merger_jobs)
+            self.merger_jobs,
+            worker_class=ExecutorMergeWorker,
+            worker_args=[self])

        function_name = 'executor:execute'
        if self.zone: