<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[14248] twext/trunk/twext/enterprise</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/14248">14248</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-01-06 09:06:34 -0800 (Tue, 06 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make sure overdue work is only executed if its priority is allowed based on the current queue load.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#twexttrunktwextenterprisejobqueuepy">twext/trunk/twext/enterprise/jobqueue.py</a></li>
<li><a href="#twexttrunktwextenterprisetesttest_jobqueuepy">twext/trunk/twext/enterprise/test/test_jobqueue.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="twexttrunktwextenterprisejobqueuepy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/enterprise/jobqueue.py (14247 => 14248)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -564,10 +564,7 @@
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def nextjobs(cls, txn, now, minPriority, limit=1):
</span><span class="cx"> """
</span><del>- 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.
</del><ins>+ Find the next available job based on priority, also return any that are overdue.
</ins><span class="cx">
</span><span class="cx"> @param txn: the transaction to use
</span><span class="cx"> @type txn: L{IAsyncTransaction}
</span><span class="lines">@@ -584,8 +581,9 @@
</span><span class="cx">
</span><span class="cx"> jobs = yield cls.query(
</span><span class="cx"> txn,
</span><del>- (cls.notBefore <= now).And
- (((cls.priority >= minPriority).And(cls.assigned == None)).Or(cls.overdue < now)),
</del><ins>+ (cls.notBefore <= now).And(cls.priority >= minPriority).And(
+ (cls.assigned == None).Or(cls.overdue < now)
+ ),
</ins><span class="cx"> order=(cls.assigned, cls.priority),
</span><span class="cx"> ascending=False,
</span><span class="cx"> forUpdate=True,
</span></span></pre></div>
<a id="twexttrunktwextenterprisetesttest_jobqueuepy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/enterprise/test/test_jobqueue.py (14247 => 14248)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -515,7 +515,7 @@
</span><span class="cx"> self.assertTrue(work is None)
</span><span class="cx">
</span><span class="cx"> # Unassigned job with past notBefore returned
</span><del>- yield self._enqueue(dbpool, 2, 1, now + datetime.timedelta(days=-1))
</del><ins>+ yield self._enqueue(dbpool, 2, 1, now + datetime.timedelta(days=-1), priority=WORK_PRIORITY_HIGH)
</ins><span class="cx"> job, work = yield inTransaction(dbpool.connection, _next)
</span><span class="cx"> self.assertTrue(job is not None)
</span><span class="cx"> self.assertTrue(work.a == 2)
</span><span class="lines">@@ -1291,13 +1291,13 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><del>- def test_overdue(self):
</del><ins>+ def test_overdueStillRunning(self):
</ins><span class="cx"> """
</span><del>- L{JobItem.run} locks the work item.
</del><ins>+ Make sure an overdue work item that is still running gets its overdue value bumped.
</ins><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> # Patch JobItem.assign and JobItem.bumpOverdue to track how many times
</span><del>- # they are called.
</del><ins>+ # they are called. Also, change the overdue to be one second ahead of assigned.
</ins><span class="cx"> assigned = [0]
</span><span class="cx"> _oldAssign = JobItem.assign
</span><span class="cx"> def _newAssign(self, when, overdue):
</span><span class="lines">@@ -1338,6 +1338,8 @@
</span><span class="cx"> self.assertTrue(assigned[0] == 1)
</span><span class="cx"> self.assertTrue(bumped[0] == 0)
</span><span class="cx">
</span><ins>+ # Pause long enough that the overdue time is passed, which should result
+ # in the overdue value being bumped
</ins><span class="cx"> d = Deferred()
</span><span class="cx"> reactor.callLater(2, lambda: d.callback(None))
</span><span class="cx"> yield d
</span><span class="lines">@@ -1345,8 +1347,6 @@
</span><span class="cx"> jobs = yield inTransaction(self.store.newTransaction, checkJob)
</span><span class="cx"> self.assertTrue(len(jobs) == 1)
</span><span class="cx"> self.assertTrue(assigned[0] == 1)
</span><del>- if bumped[0] != 1:
- pass
</del><span class="cx"> self.assertTrue(bumped[0] == 1)
</span><span class="cx">
</span><span class="cx"> DummyWorkPauseItem.unpauseWork.callback(None)
</span><span class="lines">@@ -1359,6 +1359,160 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><ins>+ 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
</ins><span class="cx"> def test_aggregator_lock(self):
</span><span class="cx"> """
</span><span class="cx"> L{JobItem.run} fails an aggregated work item and then ignores it.
</span></span></pre>
</div>
</div>
</body>
</html>