<!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>[15371] CalendarServer/trunk/calendarserver</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/15371">15371</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-12-05 08:56:31 -0800 (Sat, 05 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make sure the threadpool starts up first once the reactor starts running. Also delay other services' start up actions until the reactor has started (thus ensuring that when they run the threadpool is already running).</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarserverpushapplepushpy">CalendarServer/trunk/calendarserver/push/applepush.py</a></li>
<li><a href="#CalendarServertrunkcalendarservertapcaldavpy">CalendarServer/trunk/calendarserver/tap/caldav.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcalendarserverpushapplepushpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/push/applepush.py (15370 => 15371)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/push/applepush.py 2015-12-05 00:03:23 UTC (rev 15370)
+++ CalendarServer/trunk/calendarserver/push/applepush.py 2015-12-05 16:56:31 UTC (rev 15371)
</span><span class="lines">@@ -588,7 +588,7 @@
</span><span class="cx"> def startService(self):
</span><span class="cx"> self.log.debug("APNProviderService startService")
</span><span class="cx"> self.factory = APNProviderFactory(self, self.store)
</span><del>- self.connect(self.factory)
</del><ins>+ self.reactor.callWhenRunning(self.connect, self.factory)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def stopService(self):
</span><span class="lines">@@ -807,7 +807,7 @@
</span><span class="cx"> def startService(self):
</span><span class="cx"> self.log.debug("APNFeedbackService startService")
</span><span class="cx"> self.factory = APNFeedbackFactory(self.store)
</span><del>- self.checkForFeedback()
</del><ins>+ self.reactor.callWhenRunning(self.checkForFeedback)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def stopService(self):
</span></span></pre></div>
<a id="CalendarServertrunkcalendarservertapcaldavpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tap/caldav.py (15370 => 15371)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tap/caldav.py 2015-12-05 00:03:23 UTC (rev 15370)
+++ CalendarServer/trunk/calendarserver/tap/caldav.py 2015-12-05 16:56:31 UTC (rev 15371)
</span><span class="lines">@@ -581,12 +581,19 @@
</span><span class="cx"> self.doPrincipalPurging = doPrincipalPurging
</span><span class="cx">
</span><span class="cx">
</span><ins>+ def startService(self):
+ # Do the actual DB work after the reactor has started up
+ from twisted.internet import reactor
+ reactor.callWhenRunning(self.initializeWork)
+
+
</ins><span class="cx"> @inlineCallbacks
</span><del>- def startService(self):
</del><ins>+ def initializeWork(self):
</ins><span class="cx"> # Note: the "seconds in the future" args are being set to the LogID
</span><span class="cx"> # numbers to spread them out. This is only needed until
</span><span class="cx"> # ultimatelyPerform( ) handles groups correctly. Once that is fixed
</span><span class="cx"> # these can be set to zero seconds in the future.
</span><ins>+
</ins><span class="cx"> if self.doImip:
</span><span class="cx"> yield scheduleNextMailPoll(
</span><span class="cx"> self.store,
</span><span class="lines">@@ -786,6 +793,13 @@
</span><span class="cx"> .format(config.ProcessType)
</span><span class="cx"> )
</span><span class="cx"> else:
</span><ins>+ # Always want a thread pool - so start it here before we start anything else
+ # so that it is started before any other callWhenRunning callables. This avoids
+ # a race condition that could cause a deadlock with our long-lived ADBAPI2
+ # connections which grab and hold a thread.
+ from twisted.internet import reactor
+ reactor.getThreadPool()
+
</ins><span class="cx"> #
</span><span class="cx"> # Configure Memcached Client Pool
</span><span class="cx"> #
</span></span></pre>
</div>
</div>
</body>
</html>