<!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>[12637] CalendarServer/branches/release/CalendarServer-5.2-dev/twext/enterprise</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/12637">12637</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2014-02-10 13:33:34 -0800 (Mon, 10 Feb 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Fix missing kwarg name.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesreleaseCalendarServer52devtwextenterprisequeuepy">CalendarServer/branches/release/CalendarServer-5.2-dev/twext/enterprise/queue.py</a></li>
<li><a href="#CalendarServerbranchesreleaseCalendarServer52devtwextenterprisetesttest_queuepy">CalendarServer/branches/release/CalendarServer-5.2-dev/twext/enterprise/test/test_queue.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesreleaseCalendarServer52devtwextenterprisequeuepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/release/CalendarServer-5.2-dev/twext/enterprise/queue.py (12636 => 12637)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/release/CalendarServer-5.2-dev/twext/enterprise/queue.py        2014-02-10 21:32:13 UTC (rev 12636)
+++ CalendarServer/branches/release/CalendarServer-5.2-dev/twext/enterprise/queue.py        2014-02-10 21:33:34 UTC (rev 12637)
</span><span class="lines">@@ -115,7 +115,7 @@
</span><span class="cx">     (in the worst case) pass from worker-&gt;controller-&gt;controller-&gt;worker.
</span><span class="cx">     &quot;&quot;&quot;
</span><span class="cx"> 
</span><del>-    def performWork(table, workID):
</del><ins>+    def performWork(table, workID): #@NoSelf
</ins><span class="cx">         &quot;&quot;&quot;
</span><span class="cx">         @param table: The table where work is waiting.
</span><span class="cx">         @type table: L{TableSyntax}
</span><span class="lines">@@ -371,7 +371,6 @@
</span><span class="cx">         will be taken care of by the job queueing machinery.
</span><span class="cx">         &quot;&quot;&quot;
</span><span class="cx"> 
</span><del>-
</del><span class="cx">     @classmethod
</span><span class="cx">     def forTable(cls, table):
</span><span class="cx">         &quot;&quot;&quot;
</span><span class="lines">@@ -1194,7 +1193,7 @@
</span><span class="cx">         if self.workerPool.hasAvailableCapacity():
</span><span class="cx">             return self.workerPool
</span><span class="cx">         if self.peers and not onlyLocally:
</span><del>-            return sorted(self.peers, lambda p: p.currentLoadEstimate())[0]
</del><ins>+            return sorted(self.peers, key=lambda p: p.currentLoadEstimate())[0]
</ins><span class="cx">         else:
</span><span class="cx">             return LocalPerformer(self.transactionFactory)
</span><span class="cx"> 
</span></span></pre></div>
<a id="CalendarServerbranchesreleaseCalendarServer52devtwextenterprisetesttest_queuepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/release/CalendarServer-5.2-dev/twext/enterprise/test/test_queue.py (12636 => 12637)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/release/CalendarServer-5.2-dev/twext/enterprise/test/test_queue.py        2014-02-10 21:32:13 UTC (rev 12636)
+++ CalendarServer/branches/release/CalendarServer-5.2-dev/twext/enterprise/test/test_queue.py        2014-02-10 21:33:34 UTC (rev 12637)
</span><span class="lines">@@ -418,6 +418,36 @@
</span><span class="cx">         self.assertEquals(performResult, [None])
</span><span class="cx"> 
</span><span class="cx"> 
</span><ins>+    def test_choosePerformerSorted(self):
+        &quot;&quot;&quot;
+        If L{PeerConnectionPool.choosePerformer} is invoked make it
+        return the peer with the least load.
+        &quot;&quot;&quot;
+        peer = PeerConnectionPool(None, None, 4322, schema)
+
+        class DummyPeer(object):
+            def __init__(self, name, load):
+                self.name = name
+                self.load = load
+
+            def currentLoadEstimate(self):
+                return self.load
+
+        apeer = DummyPeer(&quot;A&quot;, 1)
+        bpeer = DummyPeer(&quot;B&quot;, 0)
+        cpeer = DummyPeer(&quot;C&quot;, 2)
+        peer.addPeerConnection(apeer)
+        peer.addPeerConnection(bpeer)
+        peer.addPeerConnection(cpeer)
+
+        performer = peer.choosePerformer(onlyLocally=False)
+        self.assertEqual(performer, bpeer)
+
+        bpeer.load = 2
+        performer = peer.choosePerformer(onlyLocally=False)
+        self.assertEqual(performer, apeer)
+
+
</ins><span class="cx">     @inlineCallbacks
</span><span class="cx">     def test_notBeforeWhenCheckingForLostWork(self):
</span><span class="cx">         &quot;&quot;&quot;
</span><span class="lines">@@ -563,8 +593,8 @@
</span><span class="cx">             t = StringTransport()
</span><span class="cx">             p.makeConnection(t)
</span><span class="cx">             return p, t
</span><del>-        worker1, trans1 = peer()
-        worker2, trans2 = peer()
</del><ins>+        worker1, _ignore_trans1 = peer()
+        worker2, _ignore_trans2 = peer()
</ins><span class="cx">         # Ask the worker to do something.
</span><span class="cx">         worker1.performWork(schema.DUMMY_WORK_ITEM, 1)
</span><span class="cx">         self.assertEquals(worker1.currentLoad, 1)
</span><span class="lines">@@ -678,7 +708,7 @@
</span><span class="cx">         &quot;&quot;&quot;
</span><span class="cx">         Keep relaying data until there's no more.
</span><span class="cx">         &quot;&quot;&quot;
</span><del>-        for x in range(turns):
</del><ins>+        for _ignore_x in range(turns):
</ins><span class="cx">             if not (self.pump() or self.pump()):
</span><span class="cx">                 return
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>