[CalendarServer-changes] [14328] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 14328
          http://trac.calendarserver.org//changeset/14328
Author:   sagen at 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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150119/e405f60c/attachment-0001.html>