Merge lp:~wgrant/lazr.jobrunner/celery-3.1 into lp:lazr.jobrunner

[William Grant]

Support and require celery >= 3.0.

Support and require celery >= 3.0.

[Colin Watson (cjwatson)]

review: Approve

=== modified file 'NEWS.txt'
--- NEWS.txt	2013-06-14 00:38:07 +0000
+++ NEWS.txt	2015-08-03 08:35:57 +0000
@@ -1,6 +1,10 @@
 News
 ====
 
+0.13
+----
+* Support and require celery >= 3.0.
+
 0.12
 ----
 * Only run the job if its is_runnable property is True.

=== modified file 'buildout.cfg'
--- buildout.cfg	2015-08-03 00:34:03 +0000
+++ buildout.cfg	2015-08-03 08:35:57 +0000
@@ -22,8 +22,8 @@
 eggs = ${buildout:eggs}
 
 [versions]
-celery = 2.5.1
+celery = 3.1.18
 keyring = 0.6.2
-kombu = 2.1.1
+kombu = 3.0.26
 zc.recipe.egg = 1.3.2
 z3c.recipe.scripts = 1.0.1

=== modified file 'setup.py'
--- setup.py	2013-06-13 05:22:01 +0000
+++ setup.py	2015-08-03 08:35:57 +0000
@@ -22,13 +22,13 @@
 NEWS = open(os.path.join(here, 'NEWS.txt')).read()
 
 
-version = '0.12'
+version = '0.13'
 
 install_requires = [
     # List your project dependencies here.
     # For more details, see:
     # http://packages.python.org/distribute/setuptools.html#declaring-dependencies
-    'celery',
+    'celery>=3.0',
 ]
 
 

=== modified file 'src/lazr/jobrunner/bin/clear_queues.py'
--- src/lazr/jobrunner/bin/clear_queues.py	2012-07-04 16:34:25 +0000
+++ src/lazr/jobrunner/bin/clear_queues.py	2015-08-03 08:35:57 +0000
@@ -22,7 +22,8 @@
 from argparse import ArgumentParser
 import os
 import sys
-from amqplib.client_0_8.exceptions import AMQPChannelException
+
+import amqp
 
 
 def show_queue_data(body, message):
@@ -51,13 +52,8 @@
             drain_queues(
                 RunJob.app, [queue], callbacks=[show_queue_data],
                 retain=True, passive_queues=True)
-        except AMQPChannelException as exc:
-            if exc.amqp_reply_code == 404:
-                # Unknown queue name specified; amqp_reply_text is
-                # self-explaining.
-                print >>sys.stderr, exc.amqp_reply_text
-            else:
-                raise
+        except amqp.exceptions.NotFound as exc:
+            print >>sys.stderr, exc.reply_text
 
 
 def main():

=== modified file 'src/lazr/jobrunner/bin/jobrunnerctl.py'
--- src/lazr/jobrunner/bin/jobrunnerctl.py	2012-05-09 15:08:25 +0000
+++ src/lazr/jobrunner/bin/jobrunnerctl.py	2015-08-03 08:35:57 +0000
@@ -21,7 +21,7 @@
 import os
 import sys
 
-from celery.bin.celeryd_multi import MultiTool
+from celery.bin.multi import MultiTool
 
 
 class JobRunnerCtl(MultiTool):

=== modified file 'src/lazr/jobrunner/celerytask.py'
--- src/lazr/jobrunner/celerytask.py	2013-06-14 00:38:07 +0000
+++ src/lazr/jobrunner/celerytask.py	2015-08-03 08:35:57 +0000
@@ -21,7 +21,7 @@
 from socket import timeout
 
 from celery.task import Task
-from kombu import Consumer, Exchange, Queue
+from kombu import Consumer
 
 from lazr.jobrunner.jobrunner import (
     JobRunner,
@@ -97,18 +97,18 @@
     if callbacks is None:
         callbacks = [lambda x, y: None]
     bindings = []
-    router = app.amqp.Router(create_missing=True)
+    router = app.amqp.Router(
+        create_missing=True,
+        queues=app.amqp.Queues(app.conf.CELERY_QUEUES, create_missing=True))
     for queue_name in queue_names:
         destination = router.expand_destination(queue_name)
-        exchange = Exchange(destination['exchange'])
-        queue = Queue(queue_name, exchange=exchange)
-        bindings.append(queue)
+        bindings.append(destination['queue'])
     with app.broker_connection() as connection:
         # The no_ack flag is misleadingly named.
         # See: https://github.com/ask/kombu/issues/130
         consumer = Consumer(
             connection, bindings, callbacks=callbacks, no_ack=not retain,
-            auto_declare=not passive_queues)
+            auto_declare=not passive_queues, accept=['json', 'pickle'])
         if passive_queues:
             # This is basically copied from kombu.Queue.declare().
             # We can't use this method directly because queue_declare()

=== modified file 'src/lazr/jobrunner/tests/test_celerytask.py'
--- src/lazr/jobrunner/tests/test_celerytask.py	2012-07-09 15:53:48 +0000
+++ src/lazr/jobrunner/tests/test_celerytask.py	2015-08-03 08:35:57 +0000
@@ -69,11 +69,11 @@
         proc.wait()
 
 
-def celeryd(config_module, file_job_dir, queue='celery'):
-    cmd_args = ('--config', config_module, '--queue', queue)
+def celery_worker(config_module, file_job_dir, queue='celery'):
+    cmd_args = ('worker', '--config', config_module, '--queue', queue)
     environ = dict(os.environ)
     environ['FILE_JOB_DIR'] = file_job_dir
-    return running('bin/celeryd', cmd_args, environ, cwd=get_root())
+    return running('bin/celery', cmd_args, environ, cwd=get_root())
 
 
 @contextlib.contextmanager
@@ -342,7 +342,7 @@
             result = RunFileJob.delay(10)
             self.assertIs(None, js.get_output(job))
             self.assertEqual(JobStatus.WAITING, job.status)
-            with celeryd('lazr.jobrunner.tests.config1', temp_dir):
+            with celery_worker('lazr.jobrunner.tests.config1', temp_dir):
                 result.wait(10)
             job = js.get(job.job_id)
             self.assertEqual('my_output', js.get_output(job))
@@ -354,7 +354,7 @@
         job = FileJob(js, 10, **kwargs)
         job.save()
         result = RunFileJob.apply_async(args=(10, ), queue=queue)
-        with celeryd(config, temp_dir, queue) as proc:
+        with celery_worker(config, temp_dir, queue) as proc:
             try:
                 result.wait(10)
             except SoftTimeLimitExceeded:
@@ -373,7 +373,7 @@
         job = FileJob(js, 10, **kwargs)
         job.save()
         RunFileJobNoResult.apply_async(args=(10, ), queue=queue)
-        with celeryd(config, temp_dir, queue) as proc:
+        with celery_worker(config, temp_dir, queue) as proc:
             sleep(wait_time)
         job = js.get(job.job_id)
         return job, js, proc
@@ -393,7 +393,7 @@
         """Raises exception when a job exceeds the configured time limit."""
         with tempdir() as temp_dir:
             job, js, proc = self.run_file_job_ignore_result(
-                temp_dir, wait_time=2,
+                temp_dir, wait_time=5,
                 config='lazr.jobrunner.tests.time_limit_config',
                 sleep=3)
         self.assertEqual(JobStatus.FAILED, job.status)
@@ -405,7 +405,7 @@
         # If a fast and a slow lane are configured, jobs which time out
         # in the fast lane are queued again in the slow lane.
         with tempdir() as temp_dir:
-            with celeryd(
+            with celery_worker(
                 'lazr.jobrunner.tests.time_limit_config_slow_lane',
                 temp_dir, queue='standard_slow'):
                 # The fast lane times out after one second; the job
@@ -427,7 +427,7 @@
         # If a fast and a slow lane are configured, jobs which time out
         # in the fast lane are queued again in the slow lane.
         with tempdir() as temp_dir:
-            with celeryd(
+            with celery_worker(
                 'lazr.jobrunner.tests.time_limit_config_slow_lane',
                 temp_dir, queue='standard_slow'):
                 # The fast lane times out after one second; the job
@@ -501,7 +501,7 @@
         stdout, stderr = proc.communicate()
         return stdout, stderr
 
-    def invokeJob(self, celery_config, task, delay=1, job_args={}):
+    def invokeJob(self, celery_config, task, delay=5, job_args={}):
         """Run the given task.
 
         :return: The name of the result queue.
@@ -511,7 +511,7 @@
             job = FileJob(js, 11, **job_args)
             job.save()
             task_info = task.apply_async(args=(11, ))
-            with celeryd(celery_config, temp_dir):
+            with celery_worker(celery_config, temp_dir):
                 # Wait just long enough so that celeryd can start and
                 # process the job.
                 sleep(delay)
@@ -520,7 +520,8 @@
     def successMessage(self, task_id):
         return (
             "%s: {'status': 'SUCCESS', 'traceback': None, 'result': None, "
-            "'task_id': '%s'}\n" % (self.queueName(task_id), task_id))
+            "'task_id': '%s', 'children': []}\n"
+            % (self.queueName(task_id), task_id))
 
     def noQueueMessage(self, task_id):
         return (

=== modified file 'src/lazr/jobrunner/tests/test_jobrunnerctl.py'
--- src/lazr/jobrunner/tests/test_jobrunnerctl.py	2012-05-09 12:18:45 +0000
+++ src/lazr/jobrunner/tests/test_jobrunnerctl.py	2015-08-03 08:35:57 +0000
@@ -23,7 +23,7 @@
 from time import sleep
 from unittest import TestCase
 
-from celery.bin.celeryd_multi import NamespacedOptionParser
+from celery.bin.multi import NamespacedOptionParser
 from lazr.jobrunner.bin.jobrunnerctl import JobRunnerCtl
 from lazr.jobrunner.tests.test_celerytask import (
     FileJob,
@@ -60,25 +60,26 @@
         job.save()
         return RunFileJob.apply_async(args=(job_id, ), eta=eta)
 
-    def test_JobRunnerCtl_starts_stops_celeryd(self):
+    def test_JobRunnerCtl_starts_stops_celery_worker(self):
         with tempdir() as temp_dir:
             config = 'lazr.jobrunner.tests.config_no_prefetch'
             control = self.getController(config, temp_dir)
             argv = [
-                '--config=%s' % config, 'node_name', '-Q:node_name', 'celery',
+                'worker', '--config=%s' % config, 'node_name', '-Q:node_name',
+                'celery',
                 ]
             parser = NamespacedOptionParser(argv)
             # We may have a stale PID file.
-            old_pids = [info[2] for info in control.getpids(parser, 'celeryd')]
-            control.start(argv, 'celeryd')
+            old_pids = [info[2] for info in control.getpids(parser, 'celery')]
+            control.start(argv, 'celery')
             sleep(1)
             current_pids = [
-                info[2] for info in control.getpids(parser, 'celeryd')]
+                info[2] for info in control.getpids(parser, 'celery')]
             self.assertTrue(len(current_pids) > 0)
             self.assertNotEqual(old_pids, current_pids)
             for pid in current_pids:
                 self.assertTrue(control.node_alive(pid))
-            control.kill(argv, 'celeryd')
+            control.kill(argv, 'celery')
             sleep(1)
             for pid in current_pids:
                 self.assertFalse(control.node_alive(pid))
@@ -98,13 +99,13 @@
                 '--config=%s' % config, 'node_name', '-Q:node_name', 'celery',
                 '-c:node_name', '1',
                 ]
-            control.start(argv, 'celeryd')
-            control.kill(argv, 'celeryd')
+            control.start(argv, 'celery')
+            control.kill(argv, 'celery')
             sleep(1)
-            control.start(argv, 'celeryd')
+            control.start(argv, 'celery')
             for job in all_jobs:
                 job.wait(10)
-            control.kill(argv, 'celeryd')
+            control.kill(argv, 'celery')
 
     def test_JobRunnerCtl_kill_does_not_lose_jobs_with_eta(self):
         with tempdir() as temp_dir:
@@ -119,11 +120,11 @@
                 '--config=%s' % config, 'node_name', '-Q:node_name', 'celery',
                 '-c:node_name', '1',
                 ]
-            control.start(argv, 'celeryd')
-            sleep(1)
-            control.kill(argv, 'celeryd')
-            sleep(1)
-            control.start(argv, 'celeryd')
+            control.start(argv, 'celery')
+            sleep(1)
+            control.kill(argv, 'celery')
+            sleep(1)
+            control.start(argv, 'celery')
             for job in all_jobs:
                 job.wait(10)
-            control.kill(argv, 'celeryd')
+            control.kill(argv, 'celery')

=== modified file 'src/lazr/jobrunner/version.txt'
--- src/lazr/jobrunner/version.txt	2013-06-13 05:22:01 +0000
+++ src/lazr/jobrunner/version.txt	2015-08-03 08:35:57 +0000
@@ -1,1 +1,1 @@
-0.12
+0.13