<!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>[15119] 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/15119">15119</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-09-10 13:09:06 -0700 (Thu, 10 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add ability to override default work item priority and weight values via the config.</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>
<li><a href="#CalendarServertrunktwistedcaldavstdconfigpy">CalendarServer/trunk/twistedcaldav/stdconfig.py</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 (15118 => 15119)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tap/caldav.py 2015-09-10 19:48:57 UTC (rev 15118)
+++ CalendarServer/trunk/calendarserver/tap/caldav.py 2015-09-10 20:09:06 UTC (rev 15119)
</span><span class="lines">@@ -67,7 +67,6 @@
</span><span class="cx"> from twext.enterprise.adbapi2 import ConnectionPool
</span><span class="cx"> from twext.enterprise.ienterprise import ORACLE_DIALECT
</span><span class="cx"> from twext.enterprise.ienterprise import POSTGRES_DIALECT
</span><del>-from twext.enterprise.jobs.jobitem import JobItem
</del><span class="cx"> from twext.enterprise.jobs.queue import NonPerformingQueuer
</span><span class="cx"> from twext.enterprise.jobs.queue import ControllerQueue
</span><span class="cx"> from twext.enterprise.jobs.queue import WorkerFactory as QueueWorkerFactory
</span><span class="lines">@@ -851,8 +850,6 @@
</span><span class="cx"> if pool is not None:
</span><span class="cx"> pool.setServiceParent(result)
</span><span class="cx">
</span><del>- self._initJobQueue(None)
-
</del><span class="cx"> if config.ControlSocket:
</span><span class="cx"> id = config.ControlSocket
</span><span class="cx"> self.log.info("Control via AF_UNIX: {id}", id=id)
</span><span class="lines">@@ -1300,7 +1297,6 @@
</span><span class="cx"> useWorkerPool=False,
</span><span class="cx"> disableWorkProcessing=config.MigrationOnly,
</span><span class="cx"> )
</span><del>- self._initJobQueue(pool)
</del><span class="cx"> store.queuer = store.pool = pool
</span><span class="cx"> pool.setServiceParent(result)
</span><span class="cx">
</span><span class="lines">@@ -1865,7 +1861,6 @@
</span><span class="cx"> reactor, store.newTransaction,
</span><span class="cx"> disableWorkProcessing=config.MigrationOnly,
</span><span class="cx"> )
</span><del>- self._initJobQueue(pool)
</del><span class="cx">
</span><span class="cx"> # The master should not perform queued work
</span><span class="cx"> store.queuer = NonPerformingQueuer()
</span><span class="lines">@@ -1974,34 +1969,7 @@
</span><span class="cx"> remove(checkSocket)
</span><span class="cx">
</span><span class="cx">
</span><del>- def _initJobQueue(self, pool):
- """
- Common job queue initialization
</del><span class="cx">
</span><del>- @param pool: the connection pool to init or L{None}
- @type pool: L{PeerConnectionPool} or C{None}
- """
-
- # Initialize queue polling parameters from config settings
- if pool is not None:
- for attr in (
- "queuePollInterval",
- "queueOverdueTimeout",
- "overloadLevel",
- "highPriorityLevel",
- "mediumPriorityLevel",
- ):
- setattr(pool, attr, getattr(config.WorkQueue, attr))
-
- # Initialize job parameters from config settings
- for attr in (
- "failureRescheduleInterval",
- "lockRescheduleInterval",
- ):
- setattr(JobItem, attr, getattr(config.WorkQueue, attr))
-
-
-
</del><span class="cx"> class TwistdSlaveProcess(object):
</span><span class="cx"> """
</span><span class="cx"> A L{TwistdSlaveProcess} is information about how to start a slave process
</span></span></pre></div>
<a id="CalendarServertrunkrequirementsstabletxt"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/requirements-stable.txt (15118 => 15119)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/requirements-stable.txt 2015-09-10 19:48:57 UTC (rev 15118)
+++ CalendarServer/trunk/requirements-stable.txt 2015-09-10 20:09:06 UTC (rev 15119)
</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@15113#egg=twextpy
</del><ins>+ --editable svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@15118#egg=twextpy
</ins><span class="cx"> cffi==1.1.0
</span><span class="cx"> pycparser==2.13
</span><span class="cx"> #twisted
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavstdconfigpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/stdconfig.py (15118 => 15119)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/stdconfig.py 2015-09-10 19:48:57 UTC (rev 15118)
+++ CalendarServer/trunk/twistedcaldav/stdconfig.py 2015-09-10 20:09:06 UTC (rev 15119)
</span><span class="lines">@@ -15,18 +15,24 @@
</span><span class="cx"> # limitations under the License.
</span><span class="cx"> ##
</span><span class="cx">
</span><ins>+from os.path import basename
+from plistlib import PlistParser # @UnresolvedImport
+from socket import getfqdn, gethostbyname
</ins><span class="cx"> import copy
</span><span class="cx"> import os
</span><del>-from os.path import basename
-from plistlib import PlistParser # @UnresolvedImport
</del><span class="cx"> import re
</span><del>-from socket import getfqdn, gethostbyname
</del><span class="cx"> import sys
</span><span class="cx">
</span><span class="cx"> from calendarserver.push.util import getAPNTopicFromCertificate
</span><ins>+
+from twext.enterprise.jobs.jobitem import JobItem
+from twext.enterprise.jobs.queue import ControllerQueue
+from twext.enterprise.jobs.workitem import WorkItem
</ins><span class="cx"> from twext.python.log import Logger, InvalidLogLevelError, LogLevel
</span><ins>+
</ins><span class="cx"> from twisted.python.filepath import FilePath
</span><span class="cx"> from twisted.python.runtime import platform
</span><ins>+
</ins><span class="cx"> from twistedcaldav import caldavxml, customxml, carddavxml, mkcolxml
</span><span class="cx"> from twistedcaldav import ical
</span><span class="cx"> from twistedcaldav.config import ConfigProvider, ConfigurationError, ConfigDict
</span><span class="lines">@@ -35,7 +41,9 @@
</span><span class="cx"> from twistedcaldav.util import KeychainAccessError, KeychainPasswordNotFound
</span><span class="cx"> from twistedcaldav.util import computeProcessCount
</span><span class="cx"> from twistedcaldav.util import getPasswordFromKeychain
</span><ins>+
</ins><span class="cx"> from txdav.xml import element as davxml
</span><ins>+
</ins><span class="cx"> from txweb2.dav.resource import TwistedACLInheritable
</span><span class="cx">
</span><span class="cx"> log = Logger()
</span><span class="lines">@@ -255,6 +263,9 @@
</span><span class="cx">
</span><span class="cx"> "failureRescheduleInterval": 60, # When a job fails, reschedule it this number of seconds in the future
</span><span class="cx"> "lockRescheduleInterval": 60, # When a job can't run because of a lock, reschedule it this number of seconds in the future
</span><ins>+
+ "workParameters": {}, # dict of work table name's, whose values are dicts containing "priority"
+ # and "weight" items to use for newly created work.
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> #
</span><span class="lines">@@ -1310,6 +1321,32 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><ins>+def _updateWorkQueue(configDict, reloading=False):
+ try:
+ # Initialize queue polling parameters from config settings
+ for attr in (
+ "queuePollInterval",
+ "queueOverdueTimeout",
+ "overloadLevel",
+ "highPriorityLevel",
+ "mediumPriorityLevel",
+ ):
+ setattr(ControllerQueue, attr, getattr(config.WorkQueue, attr))
+
+ # Initialize job parameters from config settings
+ for attr in (
+ "failureRescheduleInterval",
+ "lockRescheduleInterval",
+ ):
+ setattr(JobItem, attr, getattr(config.WorkQueue, attr))
+
+ # Work parameters
+ WorkItem.updateWorkTypes(configDict.WorkQueue.workParameters)
+ except Exception:
+ log.failure("Unable to apply config.workParameters changes")
+
+
+
</ins><span class="cx"> def _updateMultiProcess(configDict, reloading=False):
</span><span class="cx"> """
</span><span class="cx"> Dynamically compute ProcessCount if it's set to 0. Always compute
</span><span class="lines">@@ -1767,6 +1804,7 @@
</span><span class="cx"> _updateMultiProcess,
</span><span class="cx"> _updateDataStore,
</span><span class="cx"> _updateHostName,
</span><ins>+ _updateWorkQueue,
</ins><span class="cx"> _postUpdateDirectoryService,
</span><span class="cx"> _postUpdateResourceService,
</span><span class="cx"> _postUpdateAugmentService,
</span></span></pre>
</div>
</div>
</body>
</html>