From f8187b414e0b6777b97d99ecf94a101eeb960e70 Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Fri, 19 Feb 2016 19:27:48 +0000 Subject: Task system tweaks, see if this fixes hangs on postponed tasks. svn path=/branches/tk705/; revision=6273 --- rpki/rpkid_tasks.py | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'rpki/rpkid_tasks.py') diff --git a/rpki/rpkid_tasks.py b/rpki/rpkid_tasks.py index 9fe193ae..afe518fa 100644 --- a/rpki/rpkid_tasks.py +++ b/rpki/rpkid_tasks.py @@ -22,6 +22,7 @@ because interactions with rpkid scheduler were getting too complicated. """ import logging +import random import tornado.gen import tornado.web @@ -126,6 +127,12 @@ class AbstractTask(object): logger.debug("%r: Postponing", self) self.due_date = None self.runnable.clear() + tasks = tuple(task for task in self.rpkid.task_queue if task is not None) + if any(task.runnable.is_set() for task in tasks): + logger.debug("%r: Runable tasks exist, leaving well enough alone", self) + else: + logger.debug("%r: All tasks were postponed, reenabling one picked at random", self) + random.choice(tasks).runnable.set() try: self.serialize.release() yield self.runnable.wait() -- cgit v1.2.3