[prev in list] [next in list] [prev in thread] [next in thread]
List: calendarserver-changes
Subject: [CalendarServer-changes] [11641] CalendarServer/branches/users/glyph/enforce-max-requests/twext/web2
From: source_changes () macosforge ! org
Date: 2013-08-26 17:39:06
Message-ID: 20130826173906.33BAF140F10 () svn ! calendarserver ! org
[Download RAW message or body]
[Attachment #2 (multipart/alternative)]
Revision: 11641
http://trac.calendarserver.org//changeset/11641
Author: glyph@apple.com
Date: 2013-08-26 10:39:06 -0700 (Mon, 26 Aug 2013)
Log Message:
-----------
Test for filling up slots without acknowledgement.
Modified Paths:
--------------
CalendarServer/branches/users/glyph/enforce-max-requests/twext/web2/test/test_metafd.py
Modified: CalendarServer/branches/users/glyph/enforce-max-requests/twext/web2/test/test_metafd.py
===================================================================
--- CalendarServer/branches/users/glyph/enforce-max-requests/twext/web2/test/test_metafd.py 2013-08-26 \
17:33:22 UTC (rev 11640)
+++ CalendarServer/branches/users/glyph/enforce-max-requests/twext/web2/test/test_metafd.py 2013-08-26 \
17:39:06 UTC (rev 11641) @@ -180,7 +180,19 @@
self.assertEquals(builder.port.reading, True)
+ def test_processStopsReadingEvenWhenConnectionsAreNotAcknowledged(self):
+ """
+ L{ConnectionLimiter.statusesChanged} determines whether the current
+ number of outstanding requests is above the limit.
+ """
+ builder = LimiterBuilder(self)
+ builder.fillUp(acknowledged=False)
+ self.assertEquals(builder.port.reading, False)
+ builder.processRestart()
+ self.assertEquals(builder.port.reading, True)
+
+
class LimiterBuilder(object):
"""
A L{LimiterBuilder} can build a L{ConnectionLimiter} and associated objects
@@ -220,15 +232,20 @@
return serverServiceMaker
- def fillUp(self):
+ def fillUp(self, acknowledged=True):
"""
Fill up all the slots on the connection limiter.
+
+ @param acknowledged: Should the virtual connections created by this
+ method send a message back to the dispatcher indicating that the
+ subprocess has acknowledged receipt of the file descriptor?
"""
for x in range(self.limiter.maxRequests):
self.dispatcher.sendFileDescriptor(None, "SSL")
- self.dispatcher.statusMessage(
- self.dispatcher._subprocessSockets[0], "+"
- )
+ if acknowledged:
+ self.dispatcher.statusMessage(
+ self.dispatcher._subprocessSockets[0], "+"
+ )
def processRestart(self):
[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>[11641] CalendarServer/branches/users/glyph/enforce-max-requests/twext/web2/test/test_metafd.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/11641">11641</a></dd> <dt>Author</dt> \
<dd>glyph@apple.com</dd> <dt>Date</dt> <dd>2013-08-26 10:39:06 -0700 (Mon, 26 Aug \
2013)</dd> </dl>
<h3>Log Message</h3>
<pre>Test for filling up slots without acknowledgement.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesusersglyphenforcemaxrequeststwextweb2testtest_meta \
fdpy">CalendarServer/branches/users/glyph/enforce-max-requests/twext/web2/test/test_metafd.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesusersglyphenforcemaxrequeststwextweb2testtest_metafdpy"></a>
<div class="modfile"><h4>Modified: \
CalendarServer/branches/users/glyph/enforce-max-requests/twext/web2/test/test_metafd.py \
(11640 => 11641)</h4> <pre class="diff"><span>
<span class="info">--- \
CalendarServer/branches/users/glyph/enforce-max-requests/twext/web2/test/test_metafd.py 2013-08-26 \
17:33:22 UTC (rev 11640)
+++ CalendarServer/branches/users/glyph/enforce-max-requests/twext/web2/test/test_metafd.py 2013-08-26 \
17:39:06 UTC (rev 11641) </span><span class="lines">@@ -180,7 +180,19 @@
</span><span class="cx"> self.assertEquals(builder.port.reading, True)
</span><span class="cx">
</span><span class="cx">
</span><ins>+ def \
test_processStopsReadingEvenWhenConnectionsAreNotAcknowledged(self): + \
""" + L{ConnectionLimiter.statusesChanged} determines whether \
the current + number of outstanding requests is above the limit.
+ """
+ builder = LimiterBuilder(self)
+ builder.fillUp(acknowledged=False)
+ self.assertEquals(builder.port.reading, False)
+ builder.processRestart()
+ self.assertEquals(builder.port.reading, True)
</ins><span class="cx">
</span><ins>+
+
</ins><span class="cx"> class LimiterBuilder(object):
</span><span class="cx"> """
</span><span class="cx"> A L{LimiterBuilder} can build a L{ConnectionLimiter} and \
associated objects </span><span class="lines">@@ -220,15 +232,20 @@
</span><span class="cx"> return serverServiceMaker
</span><span class="cx">
</span><span class="cx">
</span><del>- def fillUp(self):
</del><ins>+ def fillUp(self, acknowledged=True):
</ins><span class="cx"> """
</span><span class="cx"> Fill up all the slots on the connection limiter.
</span><ins>+
+ @param acknowledged: Should the virtual connections created by this
+ method send a message back to the dispatcher indicating that the
+ subprocess has acknowledged receipt of the file descriptor?
</ins><span class="cx"> """
</span><span class="cx"> for x in range(self.limiter.maxRequests):
</span><span class="cx"> self.dispatcher.sendFileDescriptor(None, \
"SSL") </span><del>- self.dispatcher.statusMessage(
- self.dispatcher._subprocessSockets[0], "+"
- )
</del><ins>+ if acknowledged:
+ self.dispatcher.statusMessage(
+ self.dispatcher._subprocessSockets[0], "+"
+ )
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def processRestart(self):
</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