[CalendarServer-changes] [14248] twext/trunk/twext/enterprise
source_changes at macosforge.org
source_changes at macosforge.org
Tue Jan 6 09:06:35 PST 2015
Revision: 14248
http://trac.calendarserver.org//changeset/14248
Author: cdaboo at apple.com
Date: 2015-01-06 09:06:34 -0800 (Tue, 06 Jan 2015)
Log Message:
-----------
Make sure overdue work is only executed if its priority is allowed based on the current queue load.
Modified Paths:
--------------
twext/trunk/twext/enterprise/jobqueue.py
twext/trunk/twext/enterprise/test/test_jobqueue.py
Modified: twext/trunk/twext/enterprise/jobqueue.py
===================================================================
--- twext/trunk/twext/enterprise/jobqueue.py 2015-01-06 16:44:21 UTC (rev 14247)
+++ twext/trunk/twext/enterprise/jobqueue.py 2015-01-06 17:06:34 UTC (rev 14248)
@@ -564,10 +564,7 @@
@inlineCallbacks
def nextjobs(cls, txn, now, minPriority, limit=1):
"""
- Find the next available job based on priority, also return any that are overdue. This
- method relies on there being a nextjob() SQL stored procedure to enable skipping over
- items which are row locked to help avoid contention when multiple nodes are operating
- on the job queue simultaneously.
+ Find the next available job based on priority, also return any that are overdue.
@param txn: the transaction to use
@type txn: L{IAsyncTransaction}
@@ -584,8 +581,9 @@
jobs = yield cls.query(
txn,
- (cls.notBefore <= now).And
- (((cls.priority >= minPriority).And(cls.assigned == None)).Or(cls.overdue < now)),
+ (cls.notBefore <= now).And(cls.priority >= minPriority).And(
+ (cls.assigned == None).Or(cls.overdue < now)
+ ),
order=(cls.assigned, cls.priority),
ascending=False,
forUpdate=True,
Modified: twext/trunk/twext/enterprise/test/test_jobqueue.py
===================================================================
--- twext/trunk/twext/enterprise/test/test_jobqueue.py 2015-01-06 16:44:21 UTC (rev 14247)
+++ twext/trunk/twext/enterprise/test/test_jobqueue.py 2015-01-06 17:06:34 UTC (rev 14248)
@@ -515,7 +515,7 @@
self.assertTrue(work is None)
# Unassigned job with past notBefore returned
- yield self._enqueue(dbpool, 2, 1, now + datetime.timedelta(days=-1))
+ yield self._enqueue(dbpool, 2, 1, now + datetime.timedelta(days=-1), priority=WORK_PRIORITY_HIGH)
job, work = yield inTransaction(dbpool.connection, _next)
self.assertTrue(job is not None)
self.assertTrue(work.a == 2)
@@ -1291,13 +1291,13 @@
@inlineCallbacks
- def test_overdue(self):
+ def test_overdueStillRunning(self):
"""
- L{JobItem.run} locks the work item.
+ Make sure an overdue work item that is still running gets its overdue value bumped.
"""
# Patch JobItem.assign and JobItem.bumpOverdue to track how many times
- # they are called.
+ # they are called. Also, change the overdue to be one second ahead of assigned.
assigned = [0]
_oldAssign = JobItem.assign
def _newAssign(self, when, overdue):
@@ -1338,6 +1338,8 @@
self.assertTrue(assigned[0] == 1)
self.assertTrue(bumped[0] == 0)
+ # Pause long enough that the overdue time is passed, which should result
+ # in the overdue value being bumped
d = Deferred()
reactor.callLater(2, lambda: d.callback(None))
yield d
@@ -1345,8 +1347,6 @@
jobs = yield inTransaction(self.store.newTransaction, checkJob)
self.assertTrue(len(jobs) == 1)
self.assertTrue(assigned[0] == 1)
- if bumped[0] != 1:
- pass
self.assertTrue(bumped[0] == 1)
DummyWorkPauseItem.unpauseWork.callback(None)
@@ -1359,6 +1359,160 @@
@inlineCallbacks
+ def test_overdueWorkGotLost(self):
+ """
+ Make sure an overdue work item that is not still running gets its overdue value bumped, and
+ eventually executed.
+ """
+
+ # Patch JobItem.assign and JobItem.bumpOverdue to track how many times
+ # they are called. Also, change the overdue to be one second ahead of assigned.
+ assigned = [0]
+ _oldAssign = JobItem.assign
+ def _newAssign(self, when, overdue):
+ assigned[0] += 1
+ return _oldAssign(self, when, 1)
+ self.patch(JobItem, "assign", _newAssign)
+
+ bumped = [0]
+ _oldBumped = JobItem.bumpOverdue
+ def _newBump(self, bump):
+ bumped[0] += 1
+ return _oldBumped(self, 5)
+ self.patch(JobItem, "bumpOverdue", _newBump)
+
+ failed = [0]
+ waitFail = Deferred()
+ _oldFailedToRun = JobItem.failedToRun
+ def _newFailedToRun(self, locked=False, delay=None):
+ failed[0] += 1
+ waitFail.callback(None)
+ return succeed(None)
+ self.patch(JobItem, "failedToRun", _newFailedToRun)
+
+ _oldDoWork = DummyWorkPauseItem.doWork
+ def _newDoWorkRaise(self):
+ self.workStarted.callback(None)
+ raise ValueError()
+ def _newDoWorkSuccess(self):
+ return succeed(None)
+
+ DummyWorkPauseItem.workStarted = Deferred()
+ self.patch(DummyWorkPauseItem, "doWork", _newDoWorkRaise)
+
+ @transactionally(self.store.newTransaction)
+ def _enqueue(txn):
+ return txn.enqueue(
+ DummyWorkPauseItem, a=30, b=40, workID=1
+ )
+ yield _enqueue
+
+ # Make sure we have one JOB and one DUMMY_WORK_ITEM
+ def checkJob(txn):
+ return JobItem.all(txn)
+
+ jobs = yield inTransaction(self.store.newTransaction, checkJob)
+ self.assertTrue(len(jobs) == 1)
+ self.assertTrue(assigned[0] == 0)
+ self.assertTrue(bumped[0] == 0)
+ self.assertTrue(failed[0] == 0)
+
+ # Wait for work to fail once and reset it to succeed next time
+ yield DummyWorkPauseItem.workStarted
+ self.patch(DummyWorkPauseItem, "doWork", _newDoWorkSuccess)
+ yield waitFail
+
+ jobs = yield inTransaction(self.store.newTransaction, checkJob)
+ self.assertTrue(len(jobs) == 1)
+ self.assertTrue(assigned[0] == 1)
+ self.assertTrue(bumped[0] == 0)
+ self.assertTrue(failed[0] == 1)
+
+ # Wait for the overdue to be detected and the work restarted
+ yield JobItem.waitEmpty(self.store.newTransaction, reactor, 60)
+
+ jobs = yield inTransaction(self.store.newTransaction, checkJob)
+ self.assertTrue(len(jobs) == 0)
+ self.assertTrue(assigned[0] == 2)
+ self.assertTrue(bumped[0] == 0)
+ self.assertTrue(failed[0] == 1)
+
+
+ @inlineCallbacks
+ def test_lowPriorityOverdueWorkNotAssigned(self):
+ """
+ Make sure an overdue work item that is not still running gets its overdue value bumped, and
+ eventually executed.
+ """
+
+ # Patch the work item to fail once and appear as overdue
+ _oldAssign = JobItem.assign
+ def _newAssign(self, when, overdue):
+ return _oldAssign(self, when, 1)
+ self.patch(JobItem, "assign", _newAssign)
+
+ failed = [0]
+ waitFail = Deferred()
+ _oldFailedToRun = JobItem.failedToRun
+ def _newFailedToRun(self, locked=False, delay=None):
+ failed[0] += 1
+ waitFail.callback(None)
+ return succeed(None)
+ self.patch(JobItem, "failedToRun", _newFailedToRun)
+
+ _oldDoWork = DummyWorkPauseItem.doWork
+ def _newDoWorkRaise(self):
+ self.workStarted.callback(None)
+ raise ValueError()
+ def _newDoWorkSuccess(self):
+ return succeed(None)
+
+ DummyWorkPauseItem.workStarted = Deferred()
+ self.patch(DummyWorkPauseItem, "doWork", _newDoWorkRaise)
+
+ @transactionally(self.store.newTransaction)
+ def _enqueue(txn):
+ return txn.enqueue(
+ DummyWorkPauseItem, a=30, b=40, workID=1
+ )
+ yield _enqueue
+
+ # Make sure we have one JOB and one DUMMY_WORK_ITEM
+ def checkJob(txn):
+ return JobItem.all(txn)
+
+ jobs = yield inTransaction(self.store.newTransaction, checkJob)
+ self.assertTrue(len(jobs) == 1)
+ self.assertTrue(failed[0] == 0)
+
+ # Wait for work to fail once and reset it to succeed next time
+ yield DummyWorkPauseItem.workStarted
+ self.patch(DummyWorkPauseItem, "doWork", _newDoWorkSuccess)
+ yield waitFail
+
+ jobs = yield inTransaction(self.store.newTransaction, checkJob)
+ self.assertTrue(len(jobs) == 1)
+ self.assertTrue(failed[0] == 1)
+
+ # Try to get the next high priority only job
+ @transactionally(self.store.newTransaction)
+ @inlineCallbacks
+ def _testNone(txn):
+ nowTime = datetime.datetime.utcfromtimestamp(reactor.seconds() + 10)
+ job = yield JobItem.nextjob(txn, nowTime, WORK_PRIORITY_HIGH)
+ self.assertTrue(job is None)
+
+ yield _testNone
+
+ # Wait for the overdue to be detected and the work restarted
+ yield JobItem.waitEmpty(self.store.newTransaction, reactor, 60)
+
+ jobs = yield inTransaction(self.store.newTransaction, checkJob)
+ self.assertTrue(len(jobs) == 0)
+ self.assertTrue(failed[0] == 1)
+
+
+ @inlineCallbacks
def test_aggregator_lock(self):
"""
L{JobItem.run} fails an aggregated work item and then ignores it.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150106/1212da75/attachment.html>
More information about the calendarserver-changes
mailing list