[CalendarServer-changes] [13174] CalendarServer/branches/release/CalendarServer-5.2-dev

[source_changes at macosforge.org]

Revision: 13174
          http://trac.calendarserver.org//changeset/13174
Author:   dre at apple.com
Date:     2014-04-05 10:50:04 -0700 (Sat, 05 Apr 2014)
Log Message:
-----------
Reassign expired jobs after 1 minute instead of 10; reduces impact of host outage wrt push, iMIP, groupcacher work. This delay is now configurable in the plist as WorkQueue:queueProcessTimeout

Modified Paths:
--------------
    CalendarServer/branches/release/CalendarServer-5.2-dev/calendarserver/tap/caldav.py
    CalendarServer/branches/release/CalendarServer-5.2-dev/twistedcaldav/stdconfig.py

Modified: CalendarServer/branches/release/CalendarServer-5.2-dev/calendarserver/tap/caldav.py
===================================================================
--- CalendarServer/branches/release/CalendarServer-5.2-dev/calendarserver/tap/caldav.py	2014-04-05 02:40:03 UTC (rev 13173)
+++ CalendarServer/branches/release/CalendarServer-5.2-dev/calendarserver/tap/caldav.py	2014-04-05 17:50:04 UTC (rev 13174)
@@ -904,6 +904,12 @@
         else:
             groupCacher = None
 
+        # Adjust PeerConnectionPool's queueProcessTimeout, which governs the
+        # delay before an expired job is deemed orphaned and reassigned.
+        # The default in twext is 10 minutes, which is a bit long.
+        if config.WorkQueue.queueProcessTimeout:
+            pool.queueProcessTimeout = config.WorkQueue.queueProcessTimeout
+
         def decorateTransaction(txn):
             txn._pushDistributor = pushDistributor
             txn._rootResource = result.rootResource

Modified: CalendarServer/branches/release/CalendarServer-5.2-dev/twistedcaldav/stdconfig.py
===================================================================
--- CalendarServer/branches/release/CalendarServer-5.2-dev/twistedcaldav/stdconfig.py	2014-04-05 02:40:03 UTC (rev 13173)
+++ CalendarServer/branches/release/CalendarServer-5.2-dev/twistedcaldav/stdconfig.py	2014-04-05 17:50:04 UTC (rev 13174)
@@ -318,6 +318,13 @@
                                     # upgrade.
 
     #
+    # Work queue configuration
+    #
+    "WorkQueue": {
+        "queueProcessTimeout": 60.0,    # Seconds before an expired job is deemed orphaned and reassigned
+    },
+
+    #
     # Types of service provided
     #
     "EnableCalDAV"  : True, # Enable CalDAV service
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140405/25eacc2c/attachment.html>