[CalendarServer-changes] [15774] CalendarServer/branches/users/vramachandran/disableWorkProcessing

[source_changes at macosforge.org]

Revision: 15774
          http://trac.calendarserver.org//changeset/15774
Author:   vramachandran at apple.com
Date:     2016-07-15 11:18:13 -0700 (Fri, 15 Jul 2016)
Log Message:
-----------
Added new flag to make a server instance not poll JOb table; default behavior is current behavior

Modified Paths:
--------------
    CalendarServer/branches/users/vramachandran/disableWorkProcessing/bin/_build.sh
    CalendarServer/branches/users/vramachandran/disableWorkProcessing/calendarserver/tap/caldav.py
    CalendarServer/branches/users/vramachandran/disableWorkProcessing/requirements-cs.txt
    CalendarServer/branches/users/vramachandran/disableWorkProcessing/twistedcaldav/stdconfig.py

Modified: CalendarServer/branches/users/vramachandran/disableWorkProcessing/bin/_build.sh
===================================================================
--- CalendarServer/branches/users/vramachandran/disableWorkProcessing/bin/_build.sh	2016-07-15 17:41:00 UTC (rev 15773)
+++ CalendarServer/branches/users/vramachandran/disableWorkProcessing/bin/_build.sh	2016-07-15 18:18:13 UTC (rev 15774)
@@ -688,7 +688,7 @@
     case "$(uname -s)" in
       Darwin)
         echo "macOS virtualenv codesign fix."
-        cp "/usr/bin/python" "${py_bindir}/python";
+        #cp "/usr/bin/python" "${py_bindir}/python";
         ;;
     esac;
   fi;

Modified: CalendarServer/branches/users/vramachandran/disableWorkProcessing/calendarserver/tap/caldav.py
===================================================================
--- CalendarServer/branches/users/vramachandran/disableWorkProcessing/calendarserver/tap/caldav.py	2016-07-15 17:41:00 UTC (rev 15773)
+++ CalendarServer/branches/users/vramachandran/disableWorkProcessing/calendarserver/tap/caldav.py	2016-07-15 18:18:13 UTC (rev 15774)
@@ -1390,7 +1390,8 @@
             pool = ControllerQueue(
                 reactor, store.newTransaction,
                 useWorkerPool=False,
-                disableWorkProcessing=config.MigrationOnly,
+                migrationOnly=config.MigrationOnly,
+                disableWorkProcessing=config.DisableWorkProcessing,
             )
             store.queuer = store.pool = pool
             pool.setServiceParent(result)
@@ -1912,7 +1913,8 @@
 
             pool = ControllerQueue(
                 reactor, store.newTransaction,
-                disableWorkProcessing=config.MigrationOnly,
+                migrationOnly=config.MigrationOnly,
+                disableWorkProcessing=config.DisableWorkProcessing,
             )
 
             # The master should not perform queued work

Modified: CalendarServer/branches/users/vramachandran/disableWorkProcessing/requirements-cs.txt
===================================================================
--- CalendarServer/branches/users/vramachandran/disableWorkProcessing/requirements-cs.txt	2016-07-15 17:41:00 UTC (rev 15773)
+++ CalendarServer/branches/users/vramachandran/disableWorkProcessing/requirements-cs.txt	2016-07-15 18:18:13 UTC (rev 15774)
@@ -7,7 +7,7 @@
     zope.interface==4.1.3
 	    setuptools==18.5
 
-    --editable svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@15764#egg=twextpy
+    --editable svn+https://svn.calendarserver.org/repository/calendarserver/twext/branches/users/vramachandran/disableWorkProcessing#egg=twextpy
         cffi==1.7.0
             pycparser==2.14
         #twisted

Modified: CalendarServer/branches/users/vramachandran/disableWorkProcessing/twistedcaldav/stdconfig.py
===================================================================
--- CalendarServer/branches/users/vramachandran/disableWorkProcessing/twistedcaldav/stdconfig.py	2016-07-15 17:41:00 UTC (rev 15773)
+++ CalendarServer/branches/users/vramachandran/disableWorkProcessing/twistedcaldav/stdconfig.py	2016-07-15 18:18:13 UTC (rev 15774)
@@ -298,6 +298,7 @@
     "EnableCalDAV": True, # Enable CalDAV service
     "EnableCardDAV": True, # Enable CardDAV service
     "MigrationOnly": False, # When True override all other services and set the server into podding-only mode
+    "DisableWorkProcessing" : False, # When true, this server instance will not poll the JOB table and do the asyn work
 
     #
     # Data store
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20160715/8ae3c25e/attachment.html>