<!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>[15354] 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/15354">15354</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-12-02 11:25:57 -0800 (Wed, 02 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Refactor to better support multi-pod sim. Use a proper return code from the sim.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkconfcaldavdtestpodAplist">CalendarServer/trunk/conf/caldavd-test-podA.plist</a></li>
<li><a href="#CalendarServertrunkconfcaldavdtestpodBplist">CalendarServer/trunk/conf/caldavd-test-podB.plist</a></li>
<li><a href="#CalendarServertrunkcontribperformanceloadtestclientsoldplist">CalendarServer/trunk/contrib/performance/loadtest/clients-old.plist</a></li>
<li><a href="#CalendarServertrunkcontribperformanceloadtestclientsplist">CalendarServer/trunk/contrib/performance/loadtest/clients.plist</a></li>
<li><a href="#CalendarServertrunkcontribperformanceloadtestconfigoldplist">CalendarServer/trunk/contrib/performance/loadtest/config-old.plist</a></li>
<li><a href="#CalendarServertrunkcontribperformanceloadtestconfigdistplist">CalendarServer/trunk/contrib/performance/loadtest/config.dist.plist</a></li>
<li><a href="#CalendarServertrunkcontribperformanceloadtestconfigplist">CalendarServer/trunk/contrib/performance/loadtest/config.plist</a></li>
<li><a href="#CalendarServertrunkcontribperformanceloadtesticalpy">CalendarServer/trunk/contrib/performance/loadtest/ical.py</a></li>
<li><a href="#CalendarServertrunkcontribperformanceloadtestpopulationpy">CalendarServer/trunk/contrib/performance/loadtest/population.py</a></li>
<li><a href="#CalendarServertrunkcontribperformanceloadtestsimpy">CalendarServer/trunk/contrib/performance/loadtest/sim.py</a></li>
<li><a href="#CalendarServertrunkcontribperformancesimanalysissim_regresspy">CalendarServer/trunk/contrib/performance/simanalysis/sim_regress.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkconfcaldavdtestpodAplist"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/conf/caldavd-test-podA.plist (15353 => 15354)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/conf/caldavd-test-podA.plist 2015-12-02 18:08:19 UTC (rev 15353)
+++ CalendarServer/trunk/conf/caldavd-test-podA.plist 2015-12-02 19:25:57 UTC (rev 15354)
</span><span class="lines">@@ -116,7 +116,13 @@
</span><span class="cx"> <key>AMP</key>
</span><span class="cx"> <dict>
</span><span class="cx"> <key>Enabled</key>
</span><ins>+ <true/>
+ <key>Port</key>
+ <integer>62311</integer>
+ <key>EnableStaggering</key>
</ins><span class="cx"> <false/>
</span><ins>+ <key>StaggerSeconds</key>
+ <integer>3</integer>
</ins><span class="cx"> </dict>
</span><span class="cx">
</span><span class="cx"> </dict>
</span></span></pre></div>
<a id="CalendarServertrunkconfcaldavdtestpodBplist"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/conf/caldavd-test-podB.plist (15353 => 15354)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/conf/caldavd-test-podB.plist 2015-12-02 18:08:19 UTC (rev 15353)
+++ CalendarServer/trunk/conf/caldavd-test-podB.plist 2015-12-02 19:25:57 UTC (rev 15354)
</span><span class="lines">@@ -116,7 +116,13 @@
</span><span class="cx"> <key>AMP</key>
</span><span class="cx"> <dict>
</span><span class="cx"> <key>Enabled</key>
</span><ins>+ <true/>
+ <key>Port</key>
+ <integer>62312</integer>
+ <key>EnableStaggering</key>
</ins><span class="cx"> <false/>
</span><ins>+ <key>StaggerSeconds</key>
+ <integer>3</integer>
</ins><span class="cx"> </dict>
</span><span class="cx">
</span><span class="cx"> </dict>
</span></span></pre></div>
<a id="CalendarServertrunkcontribperformanceloadtestclientsoldplist"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/contrib/performance/loadtest/clients-old.plist (15353 => 15354)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/contrib/performance/loadtest/clients-old.plist 2015-12-02 18:08:19 UTC (rev 15353)
+++ CalendarServer/trunk/contrib/performance/loadtest/clients-old.plist 2015-12-02 19:25:57 UTC (rev 15354)
</span><span class="lines">@@ -55,12 +55,6 @@
</span><span class="cx">
</span><span class="cx"> <key>supportAmpPush</key>
</span><span class="cx"> <true/>
</span><del>- <key>ampPushHosts</key>
- <array>
- <string>localhost</string>
- </array>
- <key>ampPushPort</key>
- <integer>62311</integer>
</del><span class="cx"> </dict>
</span><span class="cx">
</span><span class="cx"> <!-- The profiles define certain types of user behavior on top of the
</span></span></pre></div>
<a id="CalendarServertrunkcontribperformanceloadtestclientsplist"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/contrib/performance/loadtest/clients.plist (15353 => 15354)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/contrib/performance/loadtest/clients.plist 2015-12-02 18:08:19 UTC (rev 15353)
+++ CalendarServer/trunk/contrib/performance/loadtest/clients.plist 2015-12-02 19:25:57 UTC (rev 15354)
</span><span class="lines">@@ -55,12 +55,6 @@
</span><span class="cx">
</span><span class="cx"> <key>supportAmpPush</key>
</span><span class="cx"> <true/>
</span><del>- <key>ampPushHosts</key>
- <array>
- <string>localhost</string>
- </array>
- <key>ampPushPort</key>
- <integer>62311</integer>
</del><span class="cx"> </dict>
</span><span class="cx">
</span><span class="cx"> <!-- The profiles define certain types of user behavior on top of the
</span></span></pre></div>
<a id="CalendarServertrunkcontribperformanceloadtestconfigoldplist"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/contrib/performance/loadtest/config-old.plist (15353 => 15354)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/contrib/performance/loadtest/config-old.plist 2015-12-02 18:08:19 UTC (rev 15353)
+++ CalendarServer/trunk/contrib/performance/loadtest/config-old.plist 2015-12-02 19:25:57 UTC (rev 15354)
</span><span class="lines">@@ -31,6 +31,13 @@
</span><span class="cx"> <key>uri</key>
</span><span class="cx"> <string>https://localhost:8443</string>
</span><span class="cx">
</span><ins>+ <key>ampPushHosts</key>
+ <array>
+ <string>localhost</string>
+ </array>
+ <key>ampPushPort</key>
+ <integer>62311</integer>
+
</ins><span class="cx"> <!-- Define whether server supports stats socket. -->
</span><span class="cx"> <key>stats</key>
</span><span class="cx"> <dict>
</span><span class="lines">@@ -49,6 +56,13 @@
</span><span class="cx"> <key>uri</key>
</span><span class="cx"> <string>https://localhost:8543</string>
</span><span class="cx">
</span><ins>+ <key>ampPushHosts</key>
+ <array>
+ <string>localhost</string>
+ </array>
+ <key>ampPushPort</key>
+ <integer>62312</integer>
+
</ins><span class="cx"> <!-- Define whether server supports stats socket. -->
</span><span class="cx"> <key>stats</key>
</span><span class="cx"> <dict>
</span></span></pre></div>
<a id="CalendarServertrunkcontribperformanceloadtestconfigdistplist"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/contrib/performance/loadtest/config.dist.plist (15353 => 15354)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/contrib/performance/loadtest/config.dist.plist 2015-12-02 18:08:19 UTC (rev 15353)
+++ CalendarServer/trunk/contrib/performance/loadtest/config.dist.plist 2015-12-02 19:25:57 UTC (rev 15354)
</span><span class="lines">@@ -44,6 +44,13 @@
</span><span class="cx"> <key>uri</key>
</span><span class="cx"> <string>https://localhost:8443</string>
</span><span class="cx">
</span><ins>+ <key>ampPushHosts</key>
+ <array>
+ <string>localhost</string>
+ </array>
+ <key>ampPushPort</key>
+ <integer>62311</integer>
+
</ins><span class="cx"> <!-- Define whether server supports stats socket. -->
</span><span class="cx"> <key>stats</key>
</span><span class="cx"> <dict>
</span><span class="lines">@@ -62,6 +69,13 @@
</span><span class="cx"> <key>uri</key>
</span><span class="cx"> <string>https://localhost:8543</string>
</span><span class="cx">
</span><ins>+ <key>ampPushHosts</key>
+ <array>
+ <string>localhost</string>
+ </array>
+ <key>ampPushPort</key>
+ <integer>62312</integer>
+
</ins><span class="cx"> <!-- Define whether server supports stats socket. -->
</span><span class="cx"> <key>stats</key>
</span><span class="cx"> <dict>
</span></span></pre></div>
<a id="CalendarServertrunkcontribperformanceloadtestconfigplist"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/contrib/performance/loadtest/config.plist (15353 => 15354)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/contrib/performance/loadtest/config.plist 2015-12-02 18:08:19 UTC (rev 15353)
+++ CalendarServer/trunk/contrib/performance/loadtest/config.plist 2015-12-02 19:25:57 UTC (rev 15354)
</span><span class="lines">@@ -31,6 +31,13 @@
</span><span class="cx"> <key>uri</key>
</span><span class="cx"> <string>https://localhost:8443</string>
</span><span class="cx">
</span><ins>+ <key>ampPushHosts</key>
+ <array>
+ <string>localhost</string>
+ </array>
+ <key>ampPushPort</key>
+ <integer>62311</integer>
+
</ins><span class="cx"> <!-- Define whether server supports stats socket. -->
</span><span class="cx"> <key>stats</key>
</span><span class="cx"> <dict>
</span><span class="lines">@@ -49,6 +56,13 @@
</span><span class="cx"> <key>uri</key>
</span><span class="cx"> <string>https://localhost:8543</string>
</span><span class="cx">
</span><ins>+ <key>ampPushHosts</key>
+ <array>
+ <string>localhost</string>
+ </array>
+ <key>ampPushPort</key>
+ <integer>62312</integer>
+
</ins><span class="cx"> <!-- Define whether server supports stats socket. -->
</span><span class="cx"> <key>stats</key>
</span><span class="cx"> <dict>
</span></span></pre></div>
<a id="CalendarServertrunkcontribperformanceloadtesticalpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/contrib/performance/loadtest/ical.py (15353 => 15354)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/contrib/performance/loadtest/ical.py 2015-12-02 18:08:19 UTC (rev 15353)
+++ CalendarServer/trunk/contrib/performance/loadtest/ical.py 2015-12-02 19:25:57 UTC (rev 15354)
</span><span class="lines">@@ -489,7 +489,7 @@
</span><span class="cx"> def __init__(
</span><span class="cx"> self,
</span><span class="cx"> reactor,
</span><del>- root,
</del><ins>+ server,
</ins><span class="cx"> principalPathTemplate,
</span><span class="cx"> serializePath,
</span><span class="cx"> record,
</span><span class="lines">@@ -498,8 +498,6 @@
</span><span class="cx"> calendarHomePollInterval=None,
</span><span class="cx"> supportPush=True,
</span><span class="cx"> supportAmpPush=True,
</span><del>- ampPushHosts=None,
- ampPushPort=62311,
</del><span class="cx"> ):
</span><span class="cx">
</span><span class="cx"> self._client_id = str(uuid4())
</span><span class="lines">@@ -514,7 +512,7 @@
</span><span class="cx"> agent = ContentDecoderAgent(agent, [("gzip", GzipDecoder)])
</span><span class="cx"> self.agent = AuthHandlerAgent(agent, auth)
</span><span class="cx">
</span><del>- self.root = root
</del><ins>+ self.server = server
</ins><span class="cx"> self.principalPathTemplate = principalPathTemplate
</span><span class="cx"> self.record = record
</span><span class="cx">
</span><span class="lines">@@ -529,10 +527,11 @@
</span><span class="cx"> self.supportPush = supportPush
</span><span class="cx">
</span><span class="cx"> self.supportAmpPush = supportAmpPush
</span><ins>+ ampPushHosts = self.server.get("ampPushHosts")
</ins><span class="cx"> if ampPushHosts is None:
</span><del>- ampPushHosts = [urlparse(self.root)[1].split(":")[0]]
</del><ins>+ ampPushHosts = [urlparse(self.server["uri"])[1].split(":")[0]]
</ins><span class="cx"> self.ampPushHosts = ampPushHosts
</span><del>- self.ampPushPort = ampPushPort
</del><ins>+ self.ampPushPort = self.server.get("ampPushPort", 62311)
</ins><span class="cx">
</span><span class="cx"> self.serializePath = serializePath
</span><span class="cx">
</span><span class="lines">@@ -666,7 +665,7 @@
</span><span class="cx"> response = yield self._request(
</span><span class="cx"> allowedStatus,
</span><span class="cx"> 'PROPFIND',
</span><del>- self.root + url.encode('utf-8'),
</del><ins>+ self.server["uri"] + url.encode('utf-8'),
</ins><span class="cx"> hdrs,
</span><span class="cx"> StringProducer(body),
</span><span class="cx"> method_label=method_label,
</span><span class="lines">@@ -687,7 +686,7 @@
</span><span class="cx"> response = yield self._request(
</span><span class="cx"> (OK, MULTI_STATUS,),
</span><span class="cx"> 'PROPPATCH',
</span><del>- self.root + url.encode('utf-8'),
</del><ins>+ self.server["uri"] + url.encode('utf-8'),
</ins><span class="cx"> hdrs,
</span><span class="cx"> StringProducer(body),
</span><span class="cx"> method_label=method_label,
</span><span class="lines">@@ -711,7 +710,7 @@
</span><span class="cx"> response = yield self._request(
</span><span class="cx"> allowedStatus,
</span><span class="cx"> 'REPORT',
</span><del>- self.root + url.encode('utf-8'),
</del><ins>+ self.server["uri"] + url.encode('utf-8'),
</ins><span class="cx"> hdrs,
</span><span class="cx"> StringProducer(body),
</span><span class="cx"> method_label=method_label,
</span><span class="lines">@@ -1203,7 +1202,7 @@
</span><span class="cx"> response = yield self._request(
</span><span class="cx"> OK,
</span><span class="cx"> 'GET',
</span><del>- self.root + responseHref.encode('utf-8'),
</del><ins>+ self.server["uri"] + responseHref.encode('utf-8'),
</ins><span class="cx"> method_label="GET{notification}",
</span><span class="cx"> )
</span><span class="cx"> body = yield readBody(response)
</span><span class="lines">@@ -1261,7 +1260,7 @@
</span><span class="cx"> response = yield self._request(
</span><span class="cx"> (NO_CONTENT, NOT_FOUND),
</span><span class="cx"> 'DELETE',
</span><del>- self.root + responseHref.encode('utf-8'),
</del><ins>+ self.server["uri"] + responseHref.encode('utf-8'),
</ins><span class="cx"> method_label="DELETE{invite}",
</span><span class="cx"> )
</span><span class="cx">
</span><span class="lines">@@ -1572,7 +1571,7 @@
</span><span class="cx"> "principalURL": self.principalURL,
</span><span class="cx"> "calendars": [calendar.serialize() for calendar in sorted(self._calendars.values(), key=lambda x:x.name)],
</span><span class="cx"> "events": [event.serialize() for event in sorted(self._events.values(), key=lambda x:x.url)],
</span><del>- "notificationCollection" : self._notificationCollection.serialize(),
</del><ins>+ "notificationCollection" : self._notificationCollection.serialize() if self._notificationCollection else {},
</ins><span class="cx"> }
</span><span class="cx"> # Write JSON data
</span><span class="cx"> with open(os.path.join(path, "index.json"), "w") as f:
</span><span class="lines">@@ -1607,6 +1606,8 @@
</span><span class="cx"> for calendar in data["calendars"]:
</span><span class="cx"> calendar = Calendar.deserialize(calendar, self._events)
</span><span class="cx"> self._calendars[calendar.url] = calendar
</span><ins>+ if data["notificationCollection"]:
+ self._notificationCollection = NotificationCollection.deserialize(data, {})
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="lines">@@ -1674,7 +1675,7 @@
</span><span class="cx"> response = yield self._request(
</span><span class="cx"> (NO_CONTENT, PRECONDITION_FAILED,),
</span><span class="cx"> 'PUT',
</span><del>- self.root + href.encode('utf-8'),
</del><ins>+ self.server["uri"] + href.encode('utf-8'),
</ins><span class="cx"> Headers({
</span><span class="cx"> 'content-type': ['text/calendar'],
</span><span class="cx"> 'if-match': [event.etag]}),
</span><span class="lines">@@ -1769,7 +1770,7 @@
</span><span class="cx"> response = yield self._request(
</span><span class="cx"> okCodes,
</span><span class="cx"> 'PUT',
</span><del>- self.root + href.encode('utf-8'),
</del><ins>+ self.server["uri"] + href.encode('utf-8'),
</ins><span class="cx"> headers, StringProducer(component.getTextWithTimezones(includeTimezones=True)),
</span><span class="cx"> method_label="PUT{attendee-%s}" % (label_suffix,),
</span><span class="cx"> )
</span><span class="lines">@@ -1790,7 +1791,7 @@
</span><span class="cx"> response = yield self._request(
</span><span class="cx"> (NO_CONTENT, NOT_FOUND),
</span><span class="cx"> 'DELETE',
</span><del>- self.root + href.encode('utf-8'),
</del><ins>+ self.server["uri"] + href.encode('utf-8'),
</ins><span class="cx"> method_label="DELETE{event}",
</span><span class="cx"> )
</span><span class="cx"> returnValue(response)
</span><span class="lines">@@ -1814,7 +1815,7 @@
</span><span class="cx"> response = yield self._request(
</span><span class="cx"> CREATED,
</span><span class="cx"> 'PUT',
</span><del>- self.root + href.encode('utf-8'),
</del><ins>+ self.server["uri"] + href.encode('utf-8'),
</ins><span class="cx"> headers,
</span><span class="cx"> StringProducer(component.getTextWithTimezones(includeTimezones=True)),
</span><span class="cx"> method_label="PUT{organizer-%s}" % (label_suffix,) if invite else "PUT{event}",
</span><span class="lines">@@ -1850,7 +1851,7 @@
</span><span class="cx"> response = yield self._request(
</span><span class="cx"> (NO_CONTENT, PRECONDITION_FAILED,),
</span><span class="cx"> 'PUT',
</span><del>- self.root + href.encode('utf-8'),
</del><ins>+ self.server["uri"] + href.encode('utf-8'),
</ins><span class="cx"> Headers({
</span><span class="cx"> 'content-type': ['text/calendar'],
</span><span class="cx"> 'if-match': [event.etag]
</span><span class="lines">@@ -1882,7 +1883,7 @@
</span><span class="cx"> response = yield self._request(
</span><span class="cx"> OK,
</span><span class="cx"> 'GET',
</span><del>- self.root + href.encode('utf-8'),
</del><ins>+ self.server["uri"] + href.encode('utf-8'),
</ins><span class="cx"> method_label="GET{event}",
</span><span class="cx"> )
</span><span class="cx"> headers = response.headers
</span><span class="lines">@@ -1913,7 +1914,7 @@
</span><span class="cx"> @return: A C{Deferred} which fires with a C{dict}. Keys in the dict
</span><span class="cx"> are user UUIDs (those requested) and values are something else.
</span><span class="cx"> """
</span><del>- outbox = self.root + self.outbox
</del><ins>+ outbox = self.server["uri"] + self.outbox
</ins><span class="cx">
</span><span class="cx"> if mask:
</span><span class="cx"> maskStr = u'\r\n'.join(['X-CALENDARSERVER-MASK-UID:' + uid
</span><span class="lines">@@ -1970,7 +1971,7 @@
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def postAttachment(self, href, content):
</span><del>- url = self.root + "{0}?{1}".format(href, "action=attachment-add")
</del><ins>+ url = self.server["uri"] + "{0}?{1}".format(href, "action=attachment-add")
</ins><span class="cx"> filename = 'file-{}.txt'.format(len(content))
</span><span class="cx"> headers = Headers({
</span><span class="cx"> 'Content-Disposition': ['attachment; filename="{}"'.format(filename)]
</span><span class="lines">@@ -1995,7 +1996,7 @@
</span><span class="cx"> response = yield self._request(
</span><span class="cx"> (OK, CREATED, MULTI_STATUS),
</span><span class="cx"> 'POST',
</span><del>- self.root + href,
</del><ins>+ self.server["uri"] + href,
</ins><span class="cx"> headers=headers,
</span><span class="cx"> body=StringProducer(content),
</span><span class="cx"> method_label=label
</span></span></pre></div>
<a id="CalendarServertrunkcontribperformanceloadtestpopulationpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/contrib/performance/loadtest/population.py (15353 => 15354)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/contrib/performance/loadtest/population.py 2015-12-02 18:08:19 UTC (rev 15353)
+++ CalendarServer/trunk/contrib/performance/loadtest/population.py 2015-12-02 19:25:57 UTC (rev 15354)
</span><span class="lines">@@ -81,12 +81,12 @@
</span><span class="cx"> self.profileTypes = profileTypes
</span><span class="cx">
</span><span class="cx">
</span><del>- def new(self, reactor, serverAddress, principalPathTemplate, serializationPath, userRecord, authInfo):
</del><ins>+ def new(self, reactor, server, principalPathTemplate, serializationPath, userRecord, authInfo):
</ins><span class="cx"> """
</span><span class="cx"> Create a new instance of this client type.
</span><span class="cx"> """
</span><span class="cx"> return self.clientType(
</span><del>- reactor, serverAddress, principalPathTemplate,
</del><ins>+ reactor, server, principalPathTemplate,
</ins><span class="cx"> serializationPath, userRecord, authInfo,
</span><span class="cx"> **self.clientParams
</span><span class="cx"> )
</span><span class="lines">@@ -265,7 +265,7 @@
</span><span class="cx"> reactor = loggedReactor(self.reactor)
</span><span class="cx"> client = clientType.new(
</span><span class="cx"> reactor,
</span><del>- self.servers[record.podID]["uri"],
</del><ins>+ self.servers[record.podID],
</ins><span class="cx"> self.principalPathTemplate,
</span><span class="cx"> self.serializationPath,
</span><span class="cx"> record,
</span></span></pre></div>
<a id="CalendarServertrunkcontribperformanceloadtestsimpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/contrib/performance/loadtest/sim.py (15353 => 15354)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/contrib/performance/loadtest/sim.py 2015-12-02 18:08:19 UTC (rev 15353)
+++ CalendarServer/trunk/contrib/performance/loadtest/sim.py 2015-12-02 19:25:57 UTC (rev 15354)
</span><span class="lines">@@ -433,7 +433,9 @@
</span><span class="cx"> @classmethod
</span><span class="cx"> def main(cls, args=None):
</span><span class="cx"> simulator = cls.fromCommandLine(args)
</span><del>- raise SystemExit(simulator.run())
</del><ins>+ exitCode = simulator.run()
+ print("Exit code: {}".format(exitCode))
+ raise SystemExit(exitCode)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def createSimulator(self):
</span><span class="lines">@@ -489,7 +491,10 @@
</span><span class="cx"> self.reactor.listenTCP(self.webadminPort, Site(LoadSimAdminResource(self)))
</span><span class="cx"> self.reactor.run()
</span><span class="cx">
</span><ins>+ # Return code to indicate pass or fail
+ return 0 if all([len(obs.failures()) == 0 for obs in self.observers]) else 1
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> def stop(self):
</span><span class="cx"> if self.ms.running:
</span><span class="cx"> self.updateStats()
</span></span></pre></div>
<a id="CalendarServertrunkcontribperformancesimanalysissim_regresspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/contrib/performance/simanalysis/sim_regress.py (15353 => 15354)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/contrib/performance/simanalysis/sim_regress.py 2015-12-02 18:08:19 UTC (rev 15353)
+++ CalendarServer/trunk/contrib/performance/simanalysis/sim_regress.py 2015-12-02 19:25:57 UTC (rev 15354)
</span><span class="lines">@@ -59,7 +59,10 @@
</span><span class="cx"> self.stopServer()
</span><span class="cx"> with open(logfile) as f:
</span><span class="cx"> qos = filter(lambda line: line.strip().startswith("Qos : "), f.read().splitlines())
</span><del>- qos = float(qos[0].strip()[len("Qos : "):]) if qos else None
</del><ins>+ try:
+ qos = float(qos[0].strip()[len("Qos : "):])
+ except (IndexError, ValueError):
+ qos = None
</ins><span class="cx"> print("Revision: {} Qos: {}".format(self.currentRev, qos))
</span><span class="cx"> self.results.append((self.currentRev, qos))
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>