[prev in list] [next in list] [prev in thread] [next in thread]
List: calendarserver-changes
Subject: [CalendarServer-changes] [14328] CalendarServer/trunk
From: source_changes () macosforge ! org
Date: 2015-01-20 1:45:37
Message-ID: 20150120014537.2B28E140EFB () svn ! calendarserver ! org
[Download RAW message or body]
[Attachment #2 (multipart/alternative)]
Revision: 14328
http://trac.calendarserver.org//changeset/14328
Author: sagen@apple.com
Date: 2015-01-19 17:45:36 -0800 (Mon, 19 Jan 2015)
Log Message:
-----------
The master now no longer takes on queued work (which was happening prior to spawning the workers
Modified Paths:
--------------
CalendarServer/trunk/calendarserver/tap/caldav.py
CalendarServer/trunk/requirements-stable.txt
Modified: CalendarServer/trunk/calendarserver/tap/caldav.py
===================================================================
--- CalendarServer/trunk/calendarserver/tap/caldav.py 2015-01-20 01:42:50 UTC (rev 14327)
+++ CalendarServer/trunk/calendarserver/tap/caldav.py 2015-01-20 01:45:36 UTC (rev 14328)
@@ -1257,7 +1257,8 @@
ampPort = None
pool = PeerConnectionPool(
- reactor, store.newTransaction, ampPort
+ reactor, store.newTransaction, ampPort,
+ useWorkerPool=False
)
self._initJobQueue(pool)
store.queuer = store.queuer.transferProposalCallbacks(pool)
@@ -1852,7 +1853,10 @@
reactor, store.newTransaction, ampPort
)
self._initJobQueue(pool)
- store.queuer = store.queuer.transferProposalCallbacks(pool)
+
+ # The master should not perform queued work
+ store.queuer = NonPerformingQueuer()
+
controlSocket.addFactory(
_QUEUE_ROUTE, pool.workerListenerFactory()
)
Modified: CalendarServer/trunk/requirements-stable.txt
===================================================================
--- CalendarServer/trunk/requirements-stable.txt 2015-01-20 01:42:50 UTC (rev 14327)
+++ CalendarServer/trunk/requirements-stable.txt 2015-01-20 01:45:36 UTC (rev 14328)
@@ -36,7 +36,7 @@
#pyOpenSSL
pycrypto==2.6.1
- --editable svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@14322#egg=twextpy
+ --editable svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@14327#egg=twextpy
cffi==0.8.6
pycparser==2.10
#twisted
[Attachment #5 (text/html)]
<!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>[14328] CalendarServer/trunk</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/14328">14328</a></dd> <dt>Author</dt> \
<dd>sagen@apple.com</dd> <dt>Date</dt> <dd>2015-01-19 17:45:36 -0800 (Mon, 19 Jan \
2015)</dd> </dl>
<h3>Log Message</h3>
<pre>The master now no longer takes on queued work (which was happening prior to \
spawning the workers</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarservertapcaldavpy">CalendarServer/trunk/calendarserver/tap/caldav.py</a></li>
<li><a href="#CalendarServertrunkrequirementsstabletxt">CalendarServer/trunk/requirements-stable.txt</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcalendarservertapcaldavpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tap/caldav.py \
(14327 => 14328)</h4> <pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tap/caldav.py 2015-01-20 \
01:42:50 UTC (rev 14327)
+++ CalendarServer/trunk/calendarserver/tap/caldav.py 2015-01-20 01:45:36 UTC (rev \
14328) </span><span class="lines">@@ -1257,7 +1257,8 @@
</span><span class="cx"> ampPort = None
</span><span class="cx">
</span><span class="cx"> pool = PeerConnectionPool(
</span><del>- reactor, store.newTransaction, ampPort
</del><ins>+ reactor, store.newTransaction, ampPort,
+ useWorkerPool=False
</ins><span class="cx"> )
</span><span class="cx"> self._initJobQueue(pool)
</span><span class="cx"> store.queuer = \
store.queuer.transferProposalCallbacks(pool) </span><span class="lines">@@ -1852,7 \
+1853,10 @@ </span><span class="cx"> reactor, store.newTransaction, \
ampPort </span><span class="cx"> )
</span><span class="cx"> self._initJobQueue(pool)
</span><del>- store.queuer = store.queuer.transferProposalCallbacks(pool)
</del><ins>+
+ # The master should not perform queued work
+ store.queuer = NonPerformingQueuer()
+
</ins><span class="cx"> controlSocket.addFactory(
</span><span class="cx"> _QUEUE_ROUTE, pool.workerListenerFactory()
</span><span class="cx"> )
</span></span></pre></div>
<a id="CalendarServertrunkrequirementsstabletxt"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/requirements-stable.txt \
(14327 => 14328)</h4> <pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/requirements-stable.txt 2015-01-20 \
01:42:50 UTC (rev 14327)
+++ CalendarServer/trunk/requirements-stable.txt 2015-01-20 01:45:36 UTC (rev 14328)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> #pyOpenSSL
</span><span class="cx"> pycrypto==2.6.1
</span><span class="cx">
</span><del>- --editable \
svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@14322#egg=twextpy
</del><ins>+ --editable \
svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@14327#egg=twextpy
</ins><span class="cx"> cffi==0.8.6
</span><span class="cx"> pycparser==2.10
</span><span class="cx"> #twisted
</span></span></pre>
</div>
</div>
</body>
</html>
_______________________________________________
calendarserver-changes mailing list
calendarserver-changes@lists.macosforge.org
https://lists.macosforge.org/mailman/listinfo/calendarserver-changes
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic