<!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>[14786] 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/14786">14786</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-05-14 11:17:39 -0700 (Thu, 14 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add option to enable/disable the job queue processing.</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 (14785 => 14786)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/enterprise/jobqueue.py        2015-05-14 15:45:58 UTC (rev 14785)
+++ twext/trunk/twext/enterprise/jobqueue.py        2015-05-14 18:17:39 UTC (rev 14786)
</span><span class="lines">@@ -1952,7 +1952,7 @@
</span><span class="cx"> highPriorityLevel = 80 # Percentage load level above which only high priority jobs are processed
</span><span class="cx"> mediumPriorityLevel = 50 # Percentage load level above which high and medium priority jobs are processed
</span><span class="cx">
</span><del>- def __init__(self, reactor, transactionFactory, ampPort, useWorkerPool=True):
</del><ins>+ def __init__(self, reactor, transactionFactory, ampPort, useWorkerPool=True, disableWorkProcessing=False):
</ins><span class="cx"> """
</span><span class="cx"> Initialize a L{PeerConnectionPool}.
</span><span class="cx">
</span><span class="lines">@@ -1977,6 +1977,7 @@
</span><span class="cx"> self.ampPort = ampPort
</span><span class="cx"> self.thisProcess = None
</span><span class="cx"> self.workerPool = WorkerConnectionPool() if useWorkerPool else None
</span><ins>+ self.disableWorkProcessing = disableWorkProcessing
</ins><span class="cx"> self.peers = []
</span><span class="cx"> self.mappedPeers = {}
</span><span class="cx"> self._startingUp = None
</span><span class="lines">@@ -1995,6 +1996,20 @@
</span><span class="cx"> self.peers.append(peer)
</span><span class="cx">
</span><span class="cx">
</span><ins>+ def enable(self):
+ """
+ Turn on work queue processing.
+ """
+ self.disableWorkProcessing = False
+
+
+ def disable(self):
+ """
+ Turn off work queue processing.
+ """
+ self.disableWorkProcessing = True
+
+
</ins><span class="cx"> def totalLoad(self):
</span><span class="cx"> return self.workerPool.allWorkerLoad() if self.workerPool else 0
</span><span class="cx">
</span><span class="lines">@@ -2096,7 +2111,7 @@
</span><span class="cx">
</span><span class="cx"> loopCounter = 0
</span><span class="cx"> while True:
</span><del>- if not self.running:
</del><ins>+ if not self.running or self.disableWorkProcessing:
</ins><span class="cx"> returnValue(None)
</span><span class="cx">
</span><span class="cx"> # Check the overall service load - if overloaded skip this poll cycle.
</span></span></pre></div>
<a id="twexttrunktwextenterprisetesttest_jobqueuepy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/enterprise/test/test_jobqueue.py (14785 => 14786)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/enterprise/test/test_jobqueue.py        2015-05-14 15:45:58 UTC (rev 14785)
+++ twext/trunk/twext/enterprise/test/test_jobqueue.py        2015-05-14 18:17:39 UTC (rev 14786)
</span><span class="lines">@@ -1269,7 +1269,44 @@
</span><span class="cx"> self.assertEqual(jobs[1].notBefore, fakeNow - datetime.timedelta(20 * 60, 5))
</span><span class="cx">
</span><span class="cx">
</span><ins>+ @inlineCallbacks
+ def test_enableDisable(self):
+ """
+ L{PeerConnectionPool.enable} and L{PeerConnectionPool.disable} control queue processing.
+ """
+ dbpool, qpool, clock, performerChosen = self._setupPools()
</ins><span class="cx">
</span><ins>+ # Disable processing
+ qpool.disable()
+
+ @transactionally(dbpool.pool.connection)
+ def check(txn):
+ return qpool.enqueueWork(
+ txn, DummyWorkItem, a=3, b=9,
+ notBefore=datetime.datetime(2012, 12, 12, 12, 12, 0)
+ )
+
+ yield check
+
+ # Advance far beyond the given timestamp.
+ clock.advance(1000)
+ self.assertEquals(performerChosen, [])
+
+ # Enable processing
+ qpool.enable()
+
+ clock.advance(1000)
+ self.assertEquals(performerChosen, [True])
+
+ # Wait for job
+ while (yield inTransaction(dbpool.pool.connection, lambda txn: JobItem.all(txn))):
+ clock.advance(1)
+
+ # Work item complete
+ self.assertTrue(DummyWorkItem.results == {1: 12})
+
+
+
</ins><span class="cx"> class HalfConnection(object):
</span><span class="cx"> def __init__(self, protocol):
</span><span class="cx"> self.protocol = protocol
</span></span></pre>
</div>
</div>
</body>
</html>