<!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>[15656] CalendarServer/trunk/contrib/performance/loadtest</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/15656">15656</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2016-06-03 17:34:42 -0700 (Fri, 03 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Sim sends a configurable number of unauthenticated requests</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcontribperformanceloadtestclientsplist">CalendarServer/trunk/contrib/performance/loadtest/clients.plist</a></li>
<li><a href="#CalendarServertrunkcontribperformanceloadtesticalpy">CalendarServer/trunk/contrib/performance/loadtest/ical.py</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcontribperformanceloadtestrequestdataOS_X_10_11poll_inbox_propfindrequest">CalendarServer/trunk/contrib/performance/loadtest/request-data/OS_X_10_11/poll_inbox_propfind.request</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcontribperformanceloadtestclientsplist"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/contrib/performance/loadtest/clients.plist (15655 => 15656)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/contrib/performance/loadtest/clients.plist        2016-06-03 20:38:13 UTC (rev 15655)
+++ CalendarServer/trunk/contrib/performance/loadtest/clients.plist        2016-06-04 00:34:42 UTC (rev 15656)
</span><span class="lines">@@ -55,6 +55,10 @@
</span><span class="cx">
</span><span class="cx">                                         <key>supportAmpPush</key>
</span><span class="cx">                                         <true/>
</span><ins>+
+                                        <key>unauthenticatedPercentage</key>
+                                        <integer>27</integer>
+
</ins><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 class="lines">@@ -798,6 +802,10 @@
</span><span class="cx">
</span><span class="cx">                                         <key>supportAmpPush</key>
</span><span class="cx">                                         <true/>
</span><ins>+
+                                        <key>unauthenticatedPercentage</key>
+                                        <integer>27</integer>
+
</ins><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="CalendarServertrunkcontribperformanceloadtesticalpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/contrib/performance/loadtest/ical.py (15655 => 15656)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/contrib/performance/loadtest/ical.py        2016-06-03 20:38:13 UTC (rev 15655)
+++ CalendarServer/trunk/contrib/performance/loadtest/ical.py        2016-06-04 00:34:42 UTC (rev 15656)
</span><span class="lines">@@ -494,6 +494,7 @@
</span><span class="cx"> _POLL_CALENDAR_SYNC_REPORT = None
</span><span class="cx"> _POLL_NOTIFICATION_PROPFIND = None
</span><span class="cx"> _POLL_NOTIFICATION_PROPFIND_D1 = None
</span><ins>+ _POLL_INBOX_PROPFIND = None
</ins><span class="cx">
</span><span class="cx"> _NOTIFICATION_SYNC_REPORT = None
</span><span class="cx"> _CALENDARHOME_SYNC_REPORT = None
</span><span class="lines">@@ -518,6 +519,7 @@
</span><span class="cx"> calendarHomePollInterval=None,
</span><span class="cx"> supportPush=True,
</span><span class="cx"> supportAmpPush=True,
</span><ins>+ unauthenticatedPercentage=30,
</ins><span class="cx"> ):
</span><span class="cx">
</span><span class="cx"> self._client_id = str(uuid4())
</span><span class="lines">@@ -530,8 +532,9 @@
</span><span class="cx"> self.reactor,
</span><span class="cx"> contextFactory=_DeprecatedToCurrentPolicyForHTTPS(WebClientContextFactory()),
</span><span class="cx"> )
</span><del>- agent = ContentDecoderAgent(agent, [("gzip", GzipDecoder)])
- self.agent = AuthHandlerAgent(agent, auth)
</del><ins>+ self.noAuthAgent = ContentDecoderAgent(agent, [("gzip", GzipDecoder)])
+ self.agent = AuthHandlerAgent(self.noAuthAgent, auth)
+ self.unauthenticatedPercentage = unauthenticatedPercentage
</ins><span class="cx">
</span><span class="cx"> self.server = server
</span><span class="cx"> self.principalPathTemplate = principalPathTemplate
</span><span class="lines">@@ -636,6 +639,13 @@
</span><span class="cx"> client_id=self._client_id,
</span><span class="cx"> )
</span><span class="cx">
</span><ins>+ choice = random.randint(1, 100)
+ if choice < self.unauthenticatedPercentage:
+ # First send an unauthenticated request
+ response = yield self.noAuthAgent.request(method, url, headers, body)
+ yield readBody(response)
+
+
</ins><span class="cx"> before = self.reactor.seconds()
</span><span class="cx"> response = yield self.agent.request(method, url, headers, body)
</span><span class="cx">
</span><span class="lines">@@ -1523,6 +1533,9 @@
</span><span class="cx"> yield self._updateCalendar(self._calendars[cal.url], newToken)
</span><span class="cx"> self._calendars[cal.url].invitees = cal.invitees
</span><span class="cx">
</span><ins>+ if self._instanceNumber == 0 and cal.name == "inbox":
+ yield self._inboxPropfind()
+
</ins><span class="cx"> # Clean out previously seen collections that are no longer on the server
</span><span class="cx"> currentCalendarUris = [c.url for c in calendars]
</span><span class="cx"> for previouslySeenCalendarUri in self._calendars.keys():
</span><span class="lines">@@ -1622,6 +1635,20 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><ins>+ def _inboxPropfind(self):
+ for cal in self._calendars.itervalues():
+ if cal.name == "inbox":
+ inboxURL = cal.url
+ yield self._propfind(
+ inboxURL,
+ self._POLL_INBOX_PROPFIND,
+ depth='1',
+ method_label="PROPFIND{inbox}",
+ )
+ break
+
+
+ @inlineCallbacks
</ins><span class="cx"> def _principalExpand(self, principalURL):
</span><span class="cx"> result = yield self._report(
</span><span class="cx"> principalURL,
</span><span class="lines">@@ -2508,6 +2535,7 @@
</span><span class="cx"> _POLL_CALENDAR_SYNC_REPORT = loadRequestBody('OS_X_10_7', 'poll_calendar_sync')
</span><span class="cx"> _POLL_NOTIFICATION_PROPFIND = loadRequestBody(_LOAD_PATH, 'poll_calendar_propfind')
</span><span class="cx"> _POLL_NOTIFICATION_PROPFIND_D1 = loadRequestBody(_LOAD_PATH, 'poll_notification_depth1_propfind')
</span><ins>+ _POLL_INBOX_PROPFIND = loadRequestBody(_LOAD_PATH, 'poll_inbox_propfind')
</ins><span class="cx">
</span><span class="cx"> _NOTIFICATION_SYNC_REPORT = loadRequestBody(_LOAD_PATH, 'notification_sync')
</span><span class="cx"> _CALENDARHOME_SYNC_REPORT = loadRequestBody(_LOAD_PATH, 'poll_calendarhome_sync')
</span></span></pre></div>
<a id="CalendarServertrunkcontribperformanceloadtestrequestdataOS_X_10_11poll_inbox_propfindrequest"></a>
<div class="addfile"><h4>Added: CalendarServer/trunk/contrib/performance/loadtest/request-data/OS_X_10_11/poll_inbox_propfind.request (0 => 15656)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/contrib/performance/loadtest/request-data/OS_X_10_11/poll_inbox_propfind.request         (rev 0)
+++ CalendarServer/trunk/contrib/performance/loadtest/request-data/OS_X_10_11/poll_inbox_propfind.request        2016-06-04 00:34:42 UTC (rev 15656)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+<?xml version="1.0" encoding="UTF-8"?>
+<A:propfind xmlns:A="DAV:">
+ <A:prop>
+ <A:getcontenttype/>
+ <A:getetag/>
+ </A:prop>
+</A:propfind>
+
</ins></span></pre>
</div>
</div>
</body>
</html>