mirror of
https://github.com/django-q2/django-q2.git
synced 2026-10-07 10:08:12 +08:00
Adds a MongoDB broker
* adds mongo broker tests * adds mongo brokers docs * broker info is now cached when it needs to connect to a server, to reduce traffic.
This commit is contained in:
@@ -7,6 +7,7 @@ class Broker(object):
|
|||||||
self.connection = self.get_connection(list_key)
|
self.connection = self.get_connection(list_key)
|
||||||
self.list_key = list_key
|
self.list_key = list_key
|
||||||
self.cache = self.get_cache()
|
self.cache = self.get_cache()
|
||||||
|
self._info = None
|
||||||
|
|
||||||
def enqueue(self, task):
|
def enqueue(self, task):
|
||||||
"""
|
"""
|
||||||
@@ -78,7 +79,7 @@ class Broker(object):
|
|||||||
"""
|
"""
|
||||||
Shows the broker type
|
Shows the broker type
|
||||||
"""
|
"""
|
||||||
pass
|
return self._info
|
||||||
|
|
||||||
def set_stat(self, key, value, timeout):
|
def set_stat(self, key, value, timeout):
|
||||||
"""
|
"""
|
||||||
@@ -167,6 +168,9 @@ def get_broker(list_key=Conf.PREFIX):
|
|||||||
elif Conf.ORM:
|
elif Conf.ORM:
|
||||||
from brokers import orm
|
from brokers import orm
|
||||||
return orm.ORM(list_key=list_key)
|
return orm.ORM(list_key=list_key)
|
||||||
|
elif Conf.MONGO:
|
||||||
|
from brokers import mongo
|
||||||
|
return mongo.Mongo(list_key=list_key)
|
||||||
# default to redis
|
# default to redis
|
||||||
else:
|
else:
|
||||||
from brokers import redis_broker
|
from brokers import redis_broker
|
||||||
|
|||||||
@@ -40,8 +40,10 @@ class Disque(Broker):
|
|||||||
return len(jobs)
|
return len(jobs)
|
||||||
|
|
||||||
def info(self):
|
def info(self):
|
||||||
info = self.connection.info('server')
|
if not self._info:
|
||||||
return 'Disque {}'.format(info['disque_version'])
|
info = self.connection.info('server')
|
||||||
|
self._info= 'Disque {}'.format(info['disque_version'])
|
||||||
|
return self._info
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def get_connection(list_key=Conf.PREFIX):
|
def get_connection(list_key=Conf.PREFIX):
|
||||||
|
|||||||
@@ -0,0 +1,64 @@
|
|||||||
|
from datetime import timedelta
|
||||||
|
from time import sleep
|
||||||
|
from bson import ObjectId
|
||||||
|
|
||||||
|
from django.utils import timezone
|
||||||
|
|
||||||
|
from pymongo import MongoClient
|
||||||
|
|
||||||
|
from django_q.brokers import Broker
|
||||||
|
from django_q.conf import Conf
|
||||||
|
|
||||||
|
|
||||||
|
def _timeout():
|
||||||
|
return timezone.now() - timedelta(seconds=Conf.RETRY)
|
||||||
|
|
||||||
|
|
||||||
|
class Mongo(Broker):
|
||||||
|
def __init__(self, list_key=Conf.PREFIX):
|
||||||
|
super(Mongo, self).__init__(list_key)
|
||||||
|
self.collection = self.connection[Conf.MONGO_DB][list_key]
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def get_connection(list_key=Conf.PREFIX):
|
||||||
|
return MongoClient(**Conf.MONGO)
|
||||||
|
|
||||||
|
def queue_size(self):
|
||||||
|
return self.collection.count({'lock': {'$lte': _timeout()}})
|
||||||
|
|
||||||
|
def lock_size(self):
|
||||||
|
return self.collection.count({'lock': {'$gt': _timeout()}})
|
||||||
|
|
||||||
|
def purge_queue(self):
|
||||||
|
return self.delete_queue()
|
||||||
|
|
||||||
|
def ping(self):
|
||||||
|
return self.info is not None
|
||||||
|
|
||||||
|
def info(self):
|
||||||
|
if not self._info:
|
||||||
|
self._info = 'MongoDB {}'.format(self.connection.server_info()['version'])
|
||||||
|
return self._info
|
||||||
|
|
||||||
|
def fail(self, task_id):
|
||||||
|
self.delete(task_id)
|
||||||
|
|
||||||
|
def enqueue(self, task):
|
||||||
|
inserted_id = self.collection.insert_one({'payload': task, 'lock': _timeout()}).inserted_id
|
||||||
|
return str(inserted_id)
|
||||||
|
|
||||||
|
def dequeue(self):
|
||||||
|
task = self.collection.find_one_and_update({'lock': {'$lte': _timeout()}}, {'$set': {'lock': timezone.now()}})
|
||||||
|
if task:
|
||||||
|
return [(str(task['_id']), task['payload'])]
|
||||||
|
# empty queue, spare the cpu
|
||||||
|
sleep(0.2)
|
||||||
|
|
||||||
|
def delete_queue(self):
|
||||||
|
return self.collection.drop()
|
||||||
|
|
||||||
|
def delete(self, task_id):
|
||||||
|
self.collection.delete_one({'_id': ObjectId(task_id)})
|
||||||
|
|
||||||
|
def acknowledge(self, task_id):
|
||||||
|
return self.delete(task_id)
|
||||||
@@ -21,7 +21,7 @@ class ORM(Broker):
|
|||||||
return self.connection.filter(key=self.list_key, lock__lte=_timeout()).count()
|
return self.connection.filter(key=self.list_key, lock__lte=_timeout()).count()
|
||||||
|
|
||||||
def lock_size(self):
|
def lock_size(self):
|
||||||
return self.connection.filter(key=self.list_key, lock__gte=_timeout()).count()
|
return self.connection.filter(key=self.list_key, lock__gt=_timeout()).count()
|
||||||
|
|
||||||
def purge_queue(self):
|
def purge_queue(self):
|
||||||
return self.connection.filter(key=self.list_key).delete()
|
return self.connection.filter(key=self.list_key).delete()
|
||||||
@@ -30,7 +30,9 @@ class ORM(Broker):
|
|||||||
return True
|
return True
|
||||||
|
|
||||||
def info(self):
|
def info(self):
|
||||||
return 'ORM {}'.format(Conf.ORM)
|
if not self._info:
|
||||||
|
self._info = 'ORM {}'.format(Conf.ORM)
|
||||||
|
return self._info
|
||||||
|
|
||||||
def fail(self, task_id):
|
def fail(self, task_id):
|
||||||
self.delete(task_id)
|
self.delete(task_id)
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import redis
|
import redis
|
||||||
|
|
||||||
from django_q.brokers import Broker
|
from django_q.brokers import Broker
|
||||||
from django_q.conf import Conf, logger
|
from django_q.conf import Conf, logger
|
||||||
|
|
||||||
@@ -9,7 +10,6 @@ except ImportError:
|
|||||||
|
|
||||||
|
|
||||||
class Redis(Broker):
|
class Redis(Broker):
|
||||||
|
|
||||||
def __init__(self, list_key=Conf.PREFIX):
|
def __init__(self, list_key=Conf.PREFIX):
|
||||||
super(Redis, self).__init__(list_key='django_q:{}:q'.format(list_key))
|
super(Redis, self).__init__(list_key='django_q:{}:q'.format(list_key))
|
||||||
|
|
||||||
@@ -38,8 +38,10 @@ class Redis(Broker):
|
|||||||
raise e
|
raise e
|
||||||
|
|
||||||
def info(self):
|
def info(self):
|
||||||
info = self.connection.info('server')
|
if not self._info:
|
||||||
return 'Redis {}'.format(info['redis_version'])
|
info = self.connection.info('server')
|
||||||
|
self._info = 'Redis {}'.format(info['redis_version'])
|
||||||
|
return self._info
|
||||||
|
|
||||||
def set_stat(self, key, value, timeout):
|
def set_stat(self, key, value, timeout):
|
||||||
self.connection.set(key, value, timeout)
|
self.connection.set(key, value, timeout)
|
||||||
|
|||||||
@@ -50,6 +50,10 @@ class Conf(object):
|
|||||||
# ORM broker
|
# ORM broker
|
||||||
ORM = conf.get('orm', None)
|
ORM = conf.get('orm', None)
|
||||||
|
|
||||||
|
# MongoDB broker
|
||||||
|
MONGO = conf.get('mongo', None)
|
||||||
|
MONGO_DB = conf.get('mongo_db', 'django-q')
|
||||||
|
|
||||||
# Name of the cluster or site. For when you run multiple sites on one redis server
|
# Name of the cluster or site. For when you run multiple sites on one redis server
|
||||||
PREFIX = conf.get('name', 'default')
|
PREFIX = conf.get('name', 'default')
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -86,7 +86,7 @@ def monitor(run_once=False, broker=None):
|
|||||||
lock_size = broker.lock_size()
|
lock_size = broker.lock_size()
|
||||||
if lock_size:
|
if lock_size:
|
||||||
queue_size = '{}({})'.format(queue_size, lock_size)
|
queue_size = '{}({})'.format(queue_size, lock_size)
|
||||||
print(term.move(i, 0) + term.white_on_cyan(term.center(broker.info(), width=col_width * 2)))
|
print(term.move(i, 0) + term.white_on_cyan(term.center(broker.info, width=col_width * 2)))
|
||||||
print(term.move(i, 2 * col_width) + term.black_on_cyan(term.center(_('Queued'), width=col_width)))
|
print(term.move(i, 2 * col_width) + term.black_on_cyan(term.center(_('Queued'), width=col_width)))
|
||||||
print(term.move(i, 3 * col_width) + term.white_on_cyan(term.center(queue_size, width=col_width)))
|
print(term.move(i, 3 * col_width) + term.white_on_cyan(term.center(queue_size, width=col_width)))
|
||||||
print(term.move(i, 4 * col_width) + term.black_on_cyan(term.center(_('Success'), width=col_width)))
|
print(term.move(i, 4 * col_width) + term.black_on_cyan(term.center(_('Success'), width=col_width)))
|
||||||
|
|||||||
@@ -285,3 +285,64 @@ def test_orm():
|
|||||||
assert broker.queue_size() == 0
|
assert broker.queue_size() == 0
|
||||||
# back to django-redis
|
# back to django-redis
|
||||||
Conf.ORM = None
|
Conf.ORM = None
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.django_db
|
||||||
|
def test_mongo():
|
||||||
|
Conf.MONGO = {'host': '127.0.0.1', 'port': 27017}
|
||||||
|
# check broker
|
||||||
|
broker = get_broker(list_key='mongo_test')
|
||||||
|
assert broker.ping() is True
|
||||||
|
assert broker.info() is not None
|
||||||
|
# clear before we start
|
||||||
|
broker.delete_queue()
|
||||||
|
# enqueue
|
||||||
|
broker.enqueue('test')
|
||||||
|
assert broker.queue_size() == 1
|
||||||
|
# dequeue
|
||||||
|
task = broker.dequeue()[0]
|
||||||
|
assert task[1] == 'test'
|
||||||
|
broker.acknowledge(task[0])
|
||||||
|
assert broker.queue_size() == 0
|
||||||
|
# Retry test
|
||||||
|
Conf.RETRY = 1
|
||||||
|
broker.enqueue('test')
|
||||||
|
assert broker.queue_size() == 1
|
||||||
|
broker.dequeue()
|
||||||
|
assert broker.queue_size() == 0
|
||||||
|
sleep(1.5)
|
||||||
|
assert broker.queue_size() == 1
|
||||||
|
task = broker.dequeue()[0]
|
||||||
|
assert broker.queue_size() == 0
|
||||||
|
broker.acknowledge(task[0])
|
||||||
|
sleep(1.5)
|
||||||
|
assert broker.queue_size() == 0
|
||||||
|
# delete job
|
||||||
|
task_id = broker.enqueue('test')
|
||||||
|
broker.delete(task_id)
|
||||||
|
assert broker.dequeue() is None
|
||||||
|
# fail
|
||||||
|
task_id = broker.enqueue('test')
|
||||||
|
broker.fail(task_id)
|
||||||
|
# bulk test
|
||||||
|
for i in range(5):
|
||||||
|
broker.enqueue('test')
|
||||||
|
tasks = []
|
||||||
|
for i in range(5):
|
||||||
|
tasks.append(broker.dequeue()[0])
|
||||||
|
assert broker.lock_size() == 5
|
||||||
|
for task in tasks:
|
||||||
|
assert task is not None
|
||||||
|
broker.acknowledge(task[0])
|
||||||
|
# test lock size
|
||||||
|
assert broker.lock_size() == 0
|
||||||
|
# test duplicate acknowledge
|
||||||
|
broker.acknowledge(task[0])
|
||||||
|
# delete queue
|
||||||
|
broker.enqueue('test')
|
||||||
|
broker.enqueue('test')
|
||||||
|
broker.purge_queue()
|
||||||
|
broker.delete_queue()
|
||||||
|
assert broker.queue_size() == 0
|
||||||
|
# back to django-redis
|
||||||
|
Conf.ORM = None
|
||||||
|
|||||||
@@ -33,6 +33,7 @@ def broker():
|
|||||||
Conf.IRON_MQ = None
|
Conf.IRON_MQ = None
|
||||||
Conf.SQS = None
|
Conf.SQS = None
|
||||||
Conf.ORM = None
|
Conf.ORM = None
|
||||||
|
Conf.MONGO = None
|
||||||
Conf.DJANGO_REDIS = 'default'
|
Conf.DJANGO_REDIS = 'default'
|
||||||
return get_broker()
|
return get_broker()
|
||||||
|
|
||||||
|
|||||||
+11
-1
@@ -2,7 +2,7 @@ Brokers
|
|||||||
=======
|
=======
|
||||||
|
|
||||||
The broker sits between your Django instances and your Django Q cluster instances; accepting, saving and delivering task packages.
|
The broker sits between your Django instances and your Django Q cluster instances; accepting, saving and delivering task packages.
|
||||||
Currently we support a variety of brokers from the default Redis, bleeding edge Disque to the convenient Amazon SQS.
|
Currently we support a variety of brokers from the default Redis, bleeding edge Disque to the convenient ORM and fast MongoBD.
|
||||||
|
|
||||||
The default Redis broker does not support message receipts.
|
The default Redis broker does not support message receipts.
|
||||||
This means that in case of a catastrophic failure of the cluster server or worker timeouts, tasks that were being executed get lost.
|
This means that in case of a catastrophic failure of the cluster server or worker timeouts, tasks that were being executed get lost.
|
||||||
@@ -73,6 +73,16 @@ Although `SQS <https://aws.amazon.com/sqs/>`__ is not the fastest, it is stable,
|
|||||||
* Requires the `boto3 <https://github.com/boto/boto3>`__ client library: ``pip install boto3``
|
* Requires the `boto3 <https://github.com/boto/boto3>`__ client library: ``pip install boto3``
|
||||||
* See the :ref:`sqs_configuration` configuration section for options.
|
* See the :ref:`sqs_configuration` configuration section for options.
|
||||||
|
|
||||||
|
|
||||||
|
MongoDB
|
||||||
|
-------
|
||||||
|
The
|
||||||
|
|
||||||
|
* Delivery receipts
|
||||||
|
* Needs Django's `Cache framework <https://docs.djangoproject.com/en/1.8/topics/cache/#setting-up-the-cache>`__ configured for monitoring
|
||||||
|
* Requires the `pymongo <https://github.com/mongodb/mongo-python-driver>`__ driver: ``pip install pymongo``
|
||||||
|
* See the :ref:`mongo_configuration` configuration section for options.
|
||||||
|
|
||||||
.. _orm_broker:
|
.. _orm_broker:
|
||||||
|
|
||||||
Django ORM
|
Django ORM
|
||||||
|
|||||||
+28
-1
@@ -264,6 +264,33 @@ Using the Django ORM backend will also enable the Queued Tasks table in the Admi
|
|||||||
If you need better performance , you should consider using a different database backend than the main project.
|
If you need better performance , you should consider using a different database backend than the main project.
|
||||||
Set ``orm`` to the name of that database connection and make sure you run migrations on it using the ``--database`` option.
|
Set ``orm`` to the name of that database connection and make sure you run migrations on it using the ``--database`` option.
|
||||||
|
|
||||||
|
.. _mongo_configuration:
|
||||||
|
|
||||||
|
mongo
|
||||||
|
~~~~~
|
||||||
|
To use MongoDB as a message broker you simply provide the connection information in a dictionary ::
|
||||||
|
|
||||||
|
# example MongoDB broker connection
|
||||||
|
|
||||||
|
Q_CLUSTER = {
|
||||||
|
'name': 'MongoDB',
|
||||||
|
'workers': 8,
|
||||||
|
'timeout': 60,
|
||||||
|
'retry': 70,
|
||||||
|
'queue_limit': 100,
|
||||||
|
'mongo': {
|
||||||
|
'host': '127.0.0.1',
|
||||||
|
'port': 27017
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
The ``mongo`` dictionary can contain any of the parameters exposed by pymongo's`MongoClient<https://api.mongodb.org/python/current/api/pymongo/mongo_client.html#pymongo.mongo_client.MongoClient>`__
|
||||||
|
|
||||||
|
mongo_db
|
||||||
|
~~~~~~~~
|
||||||
|
When using the MongoDB broker you can optionally provide a database name to use for the queues.
|
||||||
|
Defaults to ``django-q``
|
||||||
|
|
||||||
.. _bulk:
|
.. _bulk:
|
||||||
|
|
||||||
bulk
|
bulk
|
||||||
@@ -273,7 +300,7 @@ Especially HTTP based or very high latency servers can benefit from bulk dequeue
|
|||||||
Keep in mind however that settings this too high can degrade performance with multiple clusters or very large task packages.
|
Keep in mind however that settings this too high can degrade performance with multiple clusters or very large task packages.
|
||||||
|
|
||||||
Not supported by the default Redis broker.
|
Not supported by the default Redis broker.
|
||||||
Defaults to 1.
|
Defaults to ``1``.
|
||||||
|
|
||||||
cache
|
cache
|
||||||
~~~~~
|
~~~~~
|
||||||
|
|||||||
Reference in New Issue
Block a user