fork/django-q2
1
0
Fork 0
mirror of https://github.com/django-q2/django-q2.git synced 2026-10-04 19:28:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Cluster now differentiates between sudden death and timeouts of workers.

Browse Source
This commit is contained in:
Ilan Steemers
2015-07-01 14:58:09 +02:00
parent 1d92b13388
commit 2397314a99
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
django_q/core.py
+12 -9
View File
@@ -195,16 +195,21 @@ class Sentinel(object):
def spawn_monitor(self): def spawn_monitor(self):
return self.spawn_process(monitor, self.done_queue) return self.spawn_process(monitor, self.done_queue)
def reincarnate(self, pid): def reincarnate(self, process):
if pid == self.monitor.pid: process.terminate()
if process == self.monitor:
self.monitor = self.spawn_monitor() self.monitor = self.spawn_monitor()
logger.warn("reincarnated monitor after death of {}".format(pid)) logger.error("reincarnated monitor {} after sudden.".format(process.pid))
elif pid == self.pusher.pid: elif process == self.pusher:
self.pusher = self.spawn_pusher() self.pusher = self.spawn_pusher()
logger.warn("reincarnated pusher after death of {}".format(pid)) logger.error("reincarnated pusher {} after sudden death".format(process.pid))
else: else:
self.pool.remove(process)
self.spawn_worker() self.spawn_worker()
logger.warn("reincarnated worker after death of {}".format(pid)) if int(process.timer.value) >= Conf.TIMEOUT:
logger.warn("reincarnated worker {} after timeout.".format(process.pid))
else:
logger.error("reincarnated worker {} after sudden death.".format(process.pid))
self.reincarnations += 1 self.reincarnations += 1
def spawn_cluster(self): def spawn_cluster(self):
@@ -227,9 +232,7 @@ class Sentinel(object):
for p in self.pool: for p in self.pool:
# Are you alive? # Are you alive?
if not p.is_alive() or (Conf.TIMEOUT and int(p.timer.value) >= Conf.TIMEOUT): if not p.is_alive() or (Conf.TIMEOUT and int(p.timer.value) >= Conf.TIMEOUT):
p.terminate() self.reincarnate(p)
self.pool.remove(p)
self.reincarnate(p.pid)
# Increment timer if work is being done # Increment timer if work is being done
if p.timer.value >= 0: if p.timer.value >= 0:
p.timer.value += 1 p.timer.value += 1