[prev in list] [next in list] [prev in thread] [next in thread]
List: calendarserver-changes
Subject: [CalendarServer-changes] [15773] twext/branches/users/vramachandran/disableWorkProcessing/twext/
From: source_changes () macosforge ! org
Date: 2016-07-15 17:41:00
Message-ID: 20160715174100.B1DF5140EDE () svn ! calendarserver ! org
[Download RAW message or body]
[Attachment #2 (multipart/alternative)]
Revision: 15773
http://trac.calendarserver.org//changeset/15773
Author: vramachandran@apple.com
Date: 2016-07-15 10:41:00 -0700 (Fri, 15 Jul 2016)
Log Message:
-----------
Added code to stop DB polling if the new flag disableWorkProcessing is set.
Modified Paths:
--------------
twext/branches/users/vramachandran/disableWorkProcessing/twext/enterprise/jobs/queue.py
Modified: twext/branches/users/vramachandran/disableWorkProcessing/twext/enterprise/jobs/queue.py
===================================================================
--- twext/branches/users/vramachandran/disableWorkProcessing/twext/enterprise/jobs/queue.py 2016-07-15 \
16:48:20 UTC (rev 15772)
+++ twext/branches/users/vramachandran/disableWorkProcessing/twext/enterprise/jobs/queue.py 2016-07-15 \
17:41:00 UTC (rev 15773) @@ -469,7 +469,7 @@
# server always use 1.
rowLimit = 1
- def __init__(self, reactor, transactionFactory, useWorkerPool=True, \
disableWorkProcessing=False): + def __init__(self, reactor, transactionFactory, \
useWorkerPool=True, migrationOnly=False, disableWorkProcessing=False): """
Initialize a L{ControllerQueue}.
@@ -483,6 +483,7 @@
self.reactor = reactor
self.transactionFactory = transactionFactory
self.workerPool = WorkerConnectionPool() if useWorkerPool else None
+ self.migrationOnly = migrationOnly
self.disableWorkProcessing = disableWorkProcessing
self._lastMinPriority = WORK_PRIORITY_LOW
self._timeOfLastWork = time.time()
@@ -495,14 +496,14 @@
"""
Turn on work queue processing.
"""
- self.disableWorkProcessing = False
+ self.migrationOnly = False
def disable(self):
"""
Turn off work queue processing.
"""
- self.disableWorkProcessing = True
+ self.migrationOnly = True
def totalLoad(self):
@@ -545,7 +546,7 @@
loopCounter = 0
while True:
- if not self.running or self.disableWorkProcessing:
+ if not self.running or self.migrationOnly:
returnValue(None)
# Check the overall service load - if overloaded skip this poll cycle.
@@ -663,7 +664,7 @@
"""
self._workCheckCall = None
- if not self.running:
+ if not self.running or self.disableWorkProcessing:
returnValue(None)
try:
@@ -671,7 +672,7 @@
except Exception as e:
log.error("_workCheckLoop: {exc}", exc=e)
- if not self.running:
+ if not self.running or self.disableWorkProcessing:
returnValue(None)
# Check for adjustment to poll interval - if the workCheck is idle for \
certain @@ -700,7 +701,7 @@
loopCounter = 0
while True:
- if not self.running or self.disableWorkProcessing:
+ if not self.running or self.migrationOnly:
returnValue(None)
# Determine what the timestamp cutoff
@@ -797,7 +798,7 @@
"""
self._overdueCheckCall = None
- if not self.running:
+ if not self.running or self.disableWorkProcessing:
returnValue(None)
try:
@@ -805,7 +806,7 @@
except Exception as e:
log.error("_overdueCheckLoop: {exc}", exc=e)
- if not self.running:
+ if not self.running or self.disableWorkProcessing:
returnValue(None)
self._overdueCheckCall = self.reactor.callLater(
[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>[15773] twext/branches/users/vramachandran/disableWorkProcessing/twext/enterprise/jobs/queue.py</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/15773">15773</a></dd> <dt>Author</dt> \
<dd>vramachandran@apple.com</dd> <dt>Date</dt> <dd>2016-07-15 10:41:00 -0700 (Fri, 15 \
Jul 2016)</dd> </dl>
<h3>Log Message</h3>
<pre>Added code to stop DB polling if the new flag disableWorkProcessing is \
set.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#twextbranchesusersvramachandrandisableWorkProcessingtwextenterprisejobsq \
ueuepy">twext/branches/users/vramachandran/disableWorkProcessing/twext/enterprise/jobs/queue.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="twextbranchesusersvramachandrandisableWorkProcessingtwextenterprisejobsqueuepy"></a>
<div class="modfile"><h4>Modified: \
twext/branches/users/vramachandran/disableWorkProcessing/twext/enterprise/jobs/queue.py \
(15772 => 15773)</h4> <pre class="diff"><span>
<span class="info">--- \
twext/branches/users/vramachandran/disableWorkProcessing/twext/enterprise/jobs/queue.py 2016-07-15 \
16:48:20 UTC (rev 15772)
+++ twext/branches/users/vramachandran/disableWorkProcessing/twext/enterprise/jobs/queue.py 2016-07-15 \
17:41:00 UTC (rev 15773) </span><span class="lines">@@ -469,7 +469,7 @@
</span><span class="cx"> # server always use 1.
</span><span class="cx"> rowLimit = 1
</span><span class="cx">
</span><del>- def __init__(self, reactor, transactionFactory, useWorkerPool=True, \
disableWorkProcessing=False): </del><ins>+ def __init__(self, reactor, \
transactionFactory, useWorkerPool=True, migrationOnly=False, \
disableWorkProcessing=False): </ins><span class="cx"> """
</span><span class="cx"> Initialize a L{ControllerQueue}.
</span><span class="cx">
</span><span class="lines">@@ -483,6 +483,7 @@
</span><span class="cx"> self.reactor = reactor
</span><span class="cx"> self.transactionFactory = transactionFactory
</span><span class="cx"> self.workerPool = WorkerConnectionPool() if \
useWorkerPool else None </span><ins>+ self.migrationOnly = migrationOnly
</ins><span class="cx"> self.disableWorkProcessing = disableWorkProcessing
</span><span class="cx"> self._lastMinPriority = WORK_PRIORITY_LOW
</span><span class="cx"> self._timeOfLastWork = time.time()
</span><span class="lines">@@ -495,14 +496,14 @@
</span><span class="cx"> """
</span><span class="cx"> Turn on work queue processing.
</span><span class="cx"> """
</span><del>- self.disableWorkProcessing = False
</del><ins>+ self.migrationOnly = False
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def disable(self):
</span><span class="cx"> """
</span><span class="cx"> Turn off work queue processing.
</span><span class="cx"> """
</span><del>- self.disableWorkProcessing = True
</del><ins>+ self.migrationOnly = True
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def totalLoad(self):
</span><span class="lines">@@ -545,7 +546,7 @@
</span><span class="cx">
</span><span class="cx"> loopCounter = 0
</span><span class="cx"> while True:
</span><del>- if not self.running or self.disableWorkProcessing:
</del><ins>+ if not self.running or self.migrationOnly:
</ins><span class="cx"> returnValue(None)
</span><span class="cx">
</span><span class="cx"> # Check the overall service load - if overloaded \
skip this poll cycle. </span><span class="lines">@@ -663,7 +664,7 @@
</span><span class="cx"> """
</span><span class="cx"> self._workCheckCall = None
</span><span class="cx">
</span><del>- if not self.running:
</del><ins>+ if not self.running or self.disableWorkProcessing:
</ins><span class="cx"> returnValue(None)
</span><span class="cx">
</span><span class="cx"> try:
</span><span class="lines">@@ -671,7 +672,7 @@
</span><span class="cx"> except Exception as e:
</span><span class="cx"> log.error("_workCheckLoop: {exc}", \
exc=e) </span><span class="cx">
</span><del>- if not self.running:
</del><ins>+ if not self.running or self.disableWorkProcessing:
</ins><span class="cx"> returnValue(None)
</span><span class="cx">
</span><span class="cx"> # Check for adjustment to poll interval - if the \
workCheck is idle for certain </span><span class="lines">@@ -700,7 +701,7 @@
</span><span class="cx">
</span><span class="cx"> loopCounter = 0
</span><span class="cx"> while True:
</span><del>- if not self.running or self.disableWorkProcessing:
</del><ins>+ if not self.running or self.migrationOnly:
</ins><span class="cx"> returnValue(None)
</span><span class="cx">
</span><span class="cx"> # Determine what the timestamp cutoff
</span><span class="lines">@@ -797,7 +798,7 @@
</span><span class="cx"> """
</span><span class="cx"> self._overdueCheckCall = None
</span><span class="cx">
</span><del>- if not self.running:
</del><ins>+ if not self.running or self.disableWorkProcessing:
</ins><span class="cx"> returnValue(None)
</span><span class="cx">
</span><span class="cx"> try:
</span><span class="lines">@@ -805,7 +806,7 @@
</span><span class="cx"> except Exception as e:
</span><span class="cx"> log.error("_overdueCheckLoop: {exc}", \
exc=e) </span><span class="cx">
</span><del>- if not self.running:
</del><ins>+ if not self.running or self.disableWorkProcessing:
</ins><span class="cx"> returnValue(None)
</span><span class="cx">
</span><span class="cx"> self._overdueCheckCall = self.reactor.callLater(
</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