<!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>[15018] twext/trunk/twext/enterprise/jobqueue.py</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/15018">15018</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-07-31 12:10:22 -0700 (Fri, 31 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix hang on service shut down due to race condition with waiting for work check loop to finish.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#twexttrunktwextenterprisejobqueuepy">twext/trunk/twext/enterprise/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 (15017 => 15018)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/enterprise/jobqueue.py 2015-07-31 16:46:12 UTC (rev 15017)
+++ twext/trunk/twext/enterprise/jobqueue.py 2015-07-31 19:10:22 UTC (rev 15018)
</span><span class="lines">@@ -2115,8 +2115,6 @@
</span><span class="cx"> if not self.running or self.disableWorkProcessing:
</span><span class="cx"> returnValue(None)
</span><span class="cx">
</span><del>- self._inWorkCheck = True
-
</del><span class="cx"> # Check the overall service load - if overloaded skip this poll cycle.
</span><span class="cx"> # FIXME: need to include capacity of other nodes. For now we only check
</span><span class="cx"> # our own capacity and stop processing if too busy. Other nodes that
</span><span class="lines">@@ -2151,9 +2149,10 @@
</span><span class="cx"> # that are due, ordered by priority, notBefore etc
</span><span class="cx"> nowTime = datetime.utcfromtimestamp(self.reactor.seconds())
</span><span class="cx">
</span><del>- txn = self.transactionFactory(label="jobqueue.workCheck")
- nextJob = None
</del><ins>+ self._inWorkCheck = True
+ txn = nextJob = None
</ins><span class="cx"> try:
</span><ins>+ txn = self.transactionFactory(label="jobqueue.workCheck")
</ins><span class="cx"> nextJob = yield JobItem.nextjob(txn, nowTime, minPriority)
</span><span class="cx"> if nextJob is None:
</span><span class="cx"> break
</span><span class="lines">@@ -2193,8 +2192,9 @@
</span><span class="cx"> jobID=nextJob.jobID if nextJob else "?",
</span><span class="cx"> exc=e,
</span><span class="cx"> )
</span><del>- yield txn.abort()
- txn = None
</del><ins>+ if txn is not None:
+ yield txn.abort()
+ txn = None
</ins><span class="cx">
</span><span class="cx"> # If we can identify the problem job, try and set it to failed so that it
</span><span class="cx"> # won't block other jobs behind it (it will be picked again when the failure
</span><span class="lines">@@ -2228,7 +2228,7 @@
</span><span class="cx"> log.error("Cannot mark failed new job")
</span><span class="cx"> break
</span><span class="cx"> finally:
</span><del>- if txn:
</del><ins>+ if txn is not None:
</ins><span class="cx"> yield txn.commit()
</span><span class="cx"> txn = None
</span><span class="cx"> self._inWorkCheck = False
</span><span class="lines">@@ -2386,11 +2386,14 @@
</span><span class="cx"> for peer in self.peers:
</span><span class="cx"> peer.transport.abortConnection()
</span><span class="cx">
</span><del>- # Wait for any active work check to finish
</del><ins>+ # Wait for any active work check to finish (but no more than 1 minute)
+ start = time.time()
</ins><span class="cx"> while self._inWorkCheck:
</span><span class="cx"> d = Deferred()
</span><span class="cx"> self.reactor.callLater(0.5, lambda : d.callback(None))
</span><span class="cx"> yield d
</span><ins>+ if time.time() - start >= 60:
+ break
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def activeNodes(self, txn):
</span></span></pre>
</div>
</div>
</body>
</html>