<!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>[15305] 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/15305">15305</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-11-11 16:07:36 -0800 (Wed, 11 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Allow sim to work again with older client profiles. Add config/client plists that match the old baseline configs.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcontribperformanceloadtesticalpy">CalendarServer/trunk/contrib/performance/loadtest/ical.py</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcontribperformanceloadtestclientsoldplist">CalendarServer/trunk/contrib/performance/loadtest/clients-old.plist</a></li>
<li><a href="#CalendarServertrunkcontribperformanceloadtestconfigoldplist">CalendarServer/trunk/contrib/performance/loadtest/config-old.plist</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcontribperformanceloadtestclientsoldplist"></a>
<div class="addfile"><h4>Added: CalendarServer/trunk/contrib/performance/loadtest/clients-old.plist (0 => 15305)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/contrib/performance/loadtest/clients-old.plist         (rev 0)
+++ CalendarServer/trunk/contrib/performance/loadtest/clients-old.plist        2015-11-12 00:07:36 UTC (rev 15305)
</span><span class="lines">@@ -0,0 +1,652 @@
</span><ins>+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Copyright (c) 2011-2015 Apple Inc. All rights reserved.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+        <dict>
+                <!-- Define the kinds of software and user behavior the load simulation
+                        will simulate. -->
+                <key>clients</key>
+
+                <!-- Have as many different kinds of software and user behavior configurations
+                        as you want. Each is a dict -->
+                <array>
+
+                        <dict>
+
+                                <!-- Here is a OS X client simulator. -->
+                                <key>software</key>
+                                <string>contrib.performance.loadtest.ical.OS_X_10_7</string>
+
+                                <!-- Arguments to use to initialize the OS_X_10_7 instance. -->
+                                <key>params</key>
+                                <dict>
+                                        <!-- Name that appears in logs. -->
+                                        <key>title</key>
+                                        <string>10.7</string>
+
+                                        <!-- OS_X_10_7 can poll the calendar home at some interval. This is
+                                                in seconds. -->
+                                        <key>calendarHomePollInterval</key>
+                                        <integer>30</integer>
+
+                                        <!-- If the server advertises xmpp push, OS_X_10_7 can wait for notifications
+                                                about calendar home changes instead of polling for them periodically. If
+                                                this option is true, then look for the server advertisement for xmpp push
+                                                and use it if possible. Still fall back to polling if there is no xmpp push
+                                                advertised. -->
+                                        <key>supportPush</key>
+                                        <false />
+
+                                        <key>supportAmpPush</key>
+                                        <true/>
+                                        <key>ampPushHost</key>
+                                        <string>localhost</string>
+                                        <key>ampPushPort</key>
+                                        <integer>62311</integer>
+                                </dict>
+
+                                <!-- The profiles define certain types of user behavior on top of the
+                                        client software being simulated. -->
+                                <key>profiles</key>
+                                <array>
+
+                                        <!-- First an event-creating profile, which will periodically create
+                                                new events at a random time on a random calendar. -->
+                                        <dict>
+                                                <key>class</key>
+                                                <string>contrib.performance.loadtest.profiles.Eventer</string>
+
+                                                <key>params</key>
+                                                <dict>
+                                                        <key>enabled</key>
+                                                        <true/>
+
+                                                        <!-- Define the interval (in seconds) at which this profile will use
+                                                                its client to create a new event. -->
+                                                        <key>interval</key>
+                                                        <integer>60</integer>
+
+                                                        <!-- Define how start times (DTSTART) for the randomly generated events
+                                                                will be selected. This is an example of a "Distribution" parameter. The value
+                                                                for most "Distribution" parameters are interchangeable and extensible. -->
+                                                        <key>eventStartDistribution</key>
+                                                        <dict>
+
+                                                                <!-- This distribution is pretty specialized. It produces timestamps
+                                                                        in the near future, limited to certain days of the week and certain hours
+                                                                        of the day. -->
+                                                                <key>type</key>
+                                                                <string>contrib.performance.stats.WorkDistribution</string>
+
+                                                                <key>params</key>
+                                                                <dict>
+                                                                        <!-- These are the days of the week the distribution will use. -->
+                                                                        <key>daysOfWeek</key>
+                                                                        <array>
+                                                                                <string>mon</string>
+                                                                                <string>tue</string>
+                                                                                <string>wed</string>
+                                                                                <string>thu</string>
+                                                                                <string>fri</string>
+                                                                        </array>
+
+                                                                        <!-- The earliest hour of a day at which an event might be scheduled. -->
+                                                                        <key>beginHour</key>
+                                                                        <integer>8</integer>
+
+                                                                        <!-- And the latest hour of a day (at which an event will be scheduled
+                                                                                to begin!). -->
+                                                                        <key>endHour</key>
+                                                                        <integer>16</integer>
+
+                                                                        <!-- The timezone in which the event is scheduled. (XXX Does this
+                                                                                really work right?) -->
+                                                                        <key>tzname</key>
+                                                                        <string>America/Los_Angeles</string>
+                                                                </dict>
+                                                        </dict>
+
+                                                        <!-- Define how recurrences are created. -->
+                                                        <key>recurrenceDistribution</key>
+                                                        <dict>
+
+                                                                <!-- This distribution is pretty specialized. We have a fixed set of
+                                                                 RRULEs defined for this distribution and pick each based on a
+                                                                 weight. -->
+                                                                <key>type</key>
+                                                                <string>contrib.performance.stats.RecurrenceDistribution</string>
+
+                                                                <key>params</key>
+                                                                <dict>
+                                                                        <!-- False to disable RRULEs -->
+                                                                        <key>allowRecurrence</key>
+                                                                        <true/>
+
+                                                                        <!-- These are the weights for the specific set of RRULEs. -->
+                                                                        <key>weights</key>
+                                                                        <dict>
+                                                                                <!-- Half of all events will be non-recurring -->
+                                                                                <key>none</key>
+                                                                                <integer>50</integer>
+
+                                                                                <!-- Daily and weekly are pretty common -->
+                                                                                <key>daily</key>
+                                                                                <integer>10</integer>
+                                                                                <key>weekly</key>
+                                                                                <integer>20</integer>
+
+                                                                                <!-- Monthly, yearly, daily & weekly limit not so common -->
+                                                                                <key>monthly</key>
+                                                                                <integer>2</integer>
+                                                                                <key>yearly</key>
+                                                                                <integer>1</integer>
+                                                                                <key>dailylimit</key>
+                                                                                <integer>2</integer>
+                                                                                <key>weeklylimit</key>
+                                                                                <integer>5</integer>
+
+                                                                                <!-- Work days pretty common -->
+                                                                                <key>workdays</key>
+                                                                                <integer>10</integer>
+                                                                        </dict>
+                                                                </dict>
+                                                        </dict>
+                                                </dict>
+                                        </dict>
+
+                                        <!-- This profile will create a new event, and then periodically update the ACKNOWLEDGED property. -->
+
+                                        <dict>
+                                                <key>class</key>
+                                                <string>contrib.performance.loadtest.profiles.AlarmAcknowledger</string>
+
+                                                <key>params</key>
+                                                <dict>
+                                                        <key>enabled</key>
+                                                        <false/>
+
+                                                        <!-- Define how often to check (in seconds) whether it's
+                                                        time to do an alarm acknowledgement -->
+                                                        <key>interval</key>
+                                                        <integer>15</integer>
+
+                                                        <!-- Acknowledgements will only actually occur at one of these
+                                                        minutes past the hour: -->
+                                                        <key>pastTheHour</key>
+                                                        <array>
+                                                                <integer>0</integer>
+                                                                <integer>15</integer>
+                                                                <integer>30</integer>
+                                                                <integer>45</integer>
+                                                        </array>
+
+                                                        <!-- Define how start times (DTSTART) for the randomly generated events
+                                                                will be selected. This is an example of a "Distribution" parameter. The value
+                                                                for most "Distribution" parameters are interchangeable and extensible. -->
+                                                        <key>eventStartDistribution</key>
+                                                        <dict>
+
+                                                                <!-- This distribution is pretty specialized. It produces timestamps
+                                                                        in the near future, limited to certain days of the week and certain hours
+                                                                        of the day. -->
+                                                                <key>type</key>
+                                                                <string>contrib.performance.stats.WorkDistribution</string>
+
+                                                                <key>params</key>
+                                                                <dict>
+                                                                        <!-- These are the days of the week the distribution will use. -->
+                                                                        <key>daysOfWeek</key>
+                                                                        <array>
+                                                                                <string>mon</string>
+                                                                                <string>tue</string>
+                                                                                <string>wed</string>
+                                                                                <string>thu</string>
+                                                                                <string>fri</string>
+                                                                        </array>
+
+                                                                        <!-- The earliest hour of a day at which an event might be scheduled. -->
+                                                                        <key>beginHour</key>
+                                                                        <integer>8</integer>
+
+                                                                        <!-- And the latest hour of a day (at which an event will be scheduled
+                                                                                to begin!). -->
+                                                                        <key>endHour</key>
+                                                                        <integer>16</integer>
+
+                                                                        <!-- The timezone in which the event is scheduled. (XXX Does this
+                                                                                really work right?) -->
+                                                                        <key>tzname</key>
+                                                                        <string>America/Los_Angeles</string>
+                                                                </dict>
+                                                        </dict>
+
+                                                        <!-- Define how recurrences are created. -->
+                                                        <key>recurrenceDistribution</key>
+                                                        <dict>
+
+                                                                <!-- This distribution is pretty specialized. We have a fixed set of
+                                                                 RRULEs defined for this distribution and pick each based on a
+                                                                 weight. -->
+                                                                <key>type</key>
+                                                                <string>contrib.performance.stats.RecurrenceDistribution</string>
+
+                                                                <key>params</key>
+                                                                <dict>
+                                                                        <!-- False to disable RRULEs -->
+                                                                        <key>allowRecurrence</key>
+                                                                        <true/>
+
+                                                                        <!-- These are the weights for the specific set of RRULEs. -->
+                                                                        <key>weights</key>
+                                                                        <dict>
+                                                                                <!-- Half of all events will be non-recurring -->
+                                                                                <key>none</key>
+                                                                                <integer>50</integer>
+
+                                                                                <!-- Daily and weekly are pretty common -->
+                                                                                <key>daily</key>
+                                                                                <integer>25</integer>
+                                                                                <key>weekly</key>
+                                                                                <integer>25</integer>
+
+                                                                                <!-- Monthly, yearly, daily & weekly limit not so common -->
+                                                                                <key>monthly</key>
+                                                                                <integer>0</integer>
+                                                                                <key>yearly</key>
+                                                                                <integer>0</integer>
+                                                                                <key>dailylimit</key>
+                                                                                <integer>0</integer>
+                                                                                <key>weeklylimit</key>
+                                                                                <integer>0</integer>
+
+                                                                                <!-- Work days pretty common -->
+                                                                                <key>workdays</key>
+                                                                                <integer>0</integer>
+                                                                        </dict>
+                                                                </dict>
+                                                        </dict>
+                                                </dict>
+                                        </dict>
+
+                                        <!-- Picks a random event and changes the title -->
+                                        <dict>
+                                                <key>class</key>
+                                                <string>contrib.performance.loadtest.profiles.TitleChanger</string>
+
+                                                <key>params</key>
+                                                <dict>
+                                                        <key>enabled</key>
+                                                        <false/>
+
+                                                        <!-- Define the interval (in seconds) at which this profile will use
+                                                                its client to create a new event. -->
+                                                        <key>interval</key>
+                                                        <integer>120</integer>
+
+                                                </dict>
+                                        </dict>
+
+                                        <!-- Picks a random event and attaches -->
+                                        <dict>
+                                                <key>class</key>
+                                                <string>contrib.performance.loadtest.profiles.Attacher</string>
+
+                                                <key>params</key>
+                                                <dict>
+                                                        <key>enabled</key>
+                                                        <false/>
+
+                                                        <!-- Define the interval (in seconds) at which this profile will use
+                                                                its client to create a new event. -->
+                                                        <key>interval</key>
+                                                        <integer>120</integer>
+
+                                                        <!-- Define the attachment size distribution. -->
+                                                        <key>fileSizeDistribution</key>
+                                                        <dict>
+                                                                <key>type</key>
+                                                                <string>contrib.performance.stats.NormalDistribution</string>
+                                                                <key>params</key>
+                                                                <dict>
+                                                                        <!-- mu gives the mean of the normal distribution (in seconds). -->
+                                                                        <key>mu</key>
+                                                                        <integer>500000</integer>
+
+                                                                        <!-- and sigma gives its standard deviation. -->
+                                                                        <key>sigma</key>
+                                                                        <integer>100000</integer>
+                                                                </dict>
+                                                        </dict>
+
+                                                </dict>
+                                        </dict>
+
+                                        <!-- Removes events from calendars exceeding a threshold -->
+                                        <dict>
+                                                <key>class</key>
+                                                <string>contrib.performance.loadtest.profiles.EventCountLimiter</string>
+
+                                                <key>params</key>
+                                                <dict>
+                                                        <key>enabled</key>
+                                                        <true/>
+
+                                                        <!-- Define the interval (in seconds) at which this profile will check
+                                                                for too-large collections. -->
+                                                        <key>interval</key>
+                                                        <integer>60</integer>
+
+                                                        <!-- The upper bound. -->
+                                                        <key>eventCountLimit</key>
+                                                        <integer>100</integer>
+
+                                                </dict>
+                                        </dict>
+
+
+                                        <!-- Shares calendars -->
+                                        <dict>
+                                                <key>class</key>
+                                                <string>contrib.performance.loadtest.profiles.CalendarSharer</string>
+
+                                                <key>params</key>
+                                                <dict>
+                                                        <key>enabled</key>
+                                                        <true/>
+
+                                                        <!-- Define the interval (in seconds) at which this profile will share calendars. -->
+                                                        <key>interval</key>
+                                                        <integer>300</integer>
+
+                                                </dict>
+                                        </dict>
+
+                                        <!-- This profile invites some number of new attendees to new events. -->
+                                        <dict>
+                                                <key>class</key>
+                                                <string>contrib.performance.loadtest.profiles.Inviter</string>
+
+                                                <key>params</key>
+                                                <dict>
+                                                        <key>enabled</key>
+                                                        <true/>
+
+                                                        <!-- Define the frequency at which new invitations will be sent out. -->
+                                                        <key>sendInvitationDistribution</key>
+                                                        <dict>
+                                                                <key>type</key>
+                                                                <string>contrib.performance.stats.NormalDistribution</string>
+                                                                <key>params</key>
+                                                                <dict>
+                                                                        <!-- mu gives the mean of the normal distribution (in seconds). -->
+                                                                        <key>mu</key>
+                                                                        <integer>60</integer>
+
+                                                                        <!-- and sigma gives its standard deviation. -->
+                                                                        <key>sigma</key>
+                                                                        <integer>5</integer>
+                                                                </dict>
+                                                        </dict>
+
+                                                        <!-- Define the distribution of who will be invited to an event.
+
+                                                                When inviteeClumping is turned on each invitee is based on a sample of
+                                                                users "close to" the organizer based on account index. If the clumping
+                                                                is too "tight" for the requested number of attendees, then invites for
+                                                                those larger numbers will simply fail (the sim will report that situation).
+
+                                                                When inviteeClumping is off invitees will be sampled across an entire
+                                                                range of account indexes. In this case the distribution ought to be a
+                                                                UniformIntegerDistribution with min=0 and max set to the number of accounts.
+                                                        -->
+                                                        <key>inviteeDistribution</key>
+                                                        <dict>
+                                                                <key>type</key>
+                                                                <string>contrib.performance.stats.UniformIntegerDistribution</string>
+                                                                <key>params</key>
+                                                                <dict>
+                                                                        <!-- The minimum value (inclusive) of the uniform distribution. -->
+                                                                        <key>min</key>
+                                                                        <integer>0</integer>
+                                                                        <!-- The maximum value (exclusive) of the uniform distribution. -->
+                                                                        <key>max</key>
+                                                                        <integer>99</integer>
+                                                                </dict>
+                                                        </dict>
+
+                                                        <key>inviteeClumping</key>
+                                                        <true/>
+
+                                                        <!-- Define the distribution of how many attendees will be invited to an event.
+
+                                                                LogNormal is the best fit to observed data.
+
+
+                                                                For LogNormal "mode" is the peak, "mean" is the mean value.        For invites,
+                                                                mode should typically be 1, and mean whatever matches the user behavior.
+                                                                Our typical mean is 6.
+                                                         -->
+                                                        <key>inviteeCountDistribution</key>
+                                                        <dict>
+                                                                <key>type</key>
+                                                                <string>contrib.performance.stats.LogNormalDistribution</string>
+                                                                <key>params</key>
+                                                                <dict>
+                                                                        <!-- mode - peak-->
+                                                                        <key>mode</key>
+                                                                        <integer>1</integer>
+                                                                        <!-- mean - average-->
+                                                                        <key>median</key>
+                                                                        <integer>6</integer>
+                                                                        <!-- maximum -->
+                                                                        <key>maximum</key>
+                                                                        <real>60</real>
+                                                                </dict>
+                                                        </dict>
+
+                                                        <!-- Define how start times (DTSTART) for the randomly generated events
+                                                                will be selected. This is an example of a "Distribution" parameter. The value
+                                                                for most "Distribution" parameters are interchangeable and extensible. -->
+                                                        <key>eventStartDistribution</key>
+                                                        <dict>
+
+                                                                <!-- This distribution is pretty specialized. It produces timestamps
+                                                                        in the near future, limited to certain days of the week and certain hours
+                                                                        of the day. -->
+                                                                <key>type</key>
+                                                                <string>contrib.performance.stats.WorkDistribution</string>
+
+                                                                <key>params</key>
+                                                                <dict>
+                                                                        <!-- These are the days of the week the distribution will use. -->
+                                                                        <key>daysOfWeek</key>
+                                                                        <array>
+                                                                                <string>mon</string>
+                                                                                <string>tue</string>
+                                                                                <string>wed</string>
+                                                                                <string>thu</string>
+                                                                                <string>fri</string>
+                                                                        </array>
+
+                                                                        <!-- The earliest hour of a day at which an event might be scheduled. -->
+                                                                        <key>beginHour</key>
+                                                                        <integer>8</integer>
+
+                                                                        <!-- And the latest hour of a day (at which an event will be scheduled
+                                                                                to begin!). -->
+                                                                        <key>endHour</key>
+                                                                        <integer>16</integer>
+
+                                                                        <!-- The timezone in which the event is scheduled. (XXX Does this
+                                                                                really work right?) -->
+                                                                        <key>tzname</key>
+                                                                        <string>America/Los_Angeles</string>
+                                                                </dict>
+                                                        </dict>
+
+                                                        <!-- Define how recurrences are created. -->
+                                                        <key>recurrenceDistribution</key>
+                                                        <dict>
+
+                                                                <!-- This distribution is pretty specialized. We have a fixed set of
+                                                                 RRULEs defined for this distribution and pick each based on a
+                                                                 weight. -->
+                                                                <key>type</key>
+                                                                <string>contrib.performance.stats.RecurrenceDistribution</string>
+
+                                                                <key>params</key>
+                                                                <dict>
+                                                                        <!-- False to disable RRULEs -->
+                                                                        <key>allowRecurrence</key>
+                                                                        <true/>
+
+                                                                        <!-- These are the weights for the specific set of RRULEs. -->
+                                                                        <key>weights</key>
+                                                                        <dict>
+                                                                                <!-- Half of all events will be non-recurring -->
+                                                                                <key>none</key>
+                                                                                <integer>50</integer>
+
+                                                                                <!-- Daily and weekly are pretty common -->
+                                                                                <key>daily</key>
+                                                                                <integer>10</integer>
+                                                                                <key>weekly</key>
+                                                                                <integer>20</integer>
+
+                                                                                <!-- Monthly, yearly, daily & weekly limit not so common -->
+                                                                                <key>monthly</key>
+                                                                                <integer>2</integer>
+                                                                                <key>yearly</key>
+                                                                                <integer>1</integer>
+                                                                                <key>dailylimit</key>
+                                                                                <integer>2</integer>
+                                                                                <key>weeklylimit</key>
+                                                                                <integer>5</integer>
+
+                                                                                <!-- Work days pretty common -->
+                                                                                <key>workdays</key>
+                                                                                <integer>10</integer>
+                                                                        </dict>
+                                                                </dict>
+                                                        </dict>
+                                                </dict>
+                                        </dict>
+
+                                        <!-- This profile accepts invitations to events, handles cancels, and
+                                         handles replies received. -->
+                                        <dict>
+                                                <key>class</key>
+                                                <string>contrib.performance.loadtest.profiles.Accepter</string>
+
+                                                <key>params</key>
+                                                <dict>
+                                                        <key>enabled</key>
+                                                        <true/>
+
+                                                        <!-- Define how long to wait after seeing a new invitation before
+                                                                accepting it.
+
+                                                                For LogNormal "mode" is the peak, "median" is the 50% cummulative value
+                                                                (i.e., half of the user have accepted by that time).
+                                                        -->
+                                                        <key>acceptDelayDistribution</key>
+                                                        <dict>
+                                                                <key>type</key>
+                                                                <string>contrib.performance.stats.LogNormalDistribution</string>
+                                                                <key>params</key>
+                                                                <dict>
+                                                                        <!-- mode - peak-->
+                                                                        <key>mode</key>
+                                                                        <integer>300</integer>
+                                                                        <!-- median - 50% done-->
+                                                                        <key>median</key>
+                                                                        <integer>1800</integer>
+                                                                </dict>
+                                                        </dict>
+                                                </dict>
+                                        </dict>
+
+                                        <!-- A task-creating profile, which will periodically create
+                                                new tasks at a random time on a random calendar. -->
+                                        <dict>
+                                                <key>class</key>
+                                                <string>contrib.performance.loadtest.profiles.Tasker</string>
+
+                                                <key>params</key>
+                                                <dict>
+                                                        <key>enabled</key>
+                                                        <true/>
+
+                                                        <!-- Define the interval (in seconds) at which this profile will use
+                                                                its client to create a new task. -->
+                                                        <key>interval</key>
+                                                        <integer>300</integer>
+
+                                                        <!-- Define how due times (DUE) for the randomly generated tasks
+                                                                will be selected. This is an example of a "Distribution" parameter. The value
+                                                                for most "Distribution" parameters are interchangeable and extensible. -->
+                                                        <key>taskDueDistribution</key>
+                                                        <dict>
+
+                                                                <!-- This distribution is pretty specialized. It produces timestamps
+                                                                        in the near future, limited to certain days of the week and certain hours
+                                                                        of the day. -->
+                                                                <key>type</key>
+                                                                <string>contrib.performance.stats.WorkDistribution</string>
+
+                                                                <key>params</key>
+                                                                <dict>
+                                                                        <!-- These are the days of the week the distribution will use. -->
+                                                                        <key>daysOfWeek</key>
+                                                                        <array>
+                                                                                <string>mon</string>
+                                                                                <string>tue</string>
+                                                                                <string>wed</string>
+                                                                                <string>thu</string>
+                                                                                <string>fri</string>
+                                                                        </array>
+
+                                                                        <!-- The earliest hour of a day at which an event might be scheduled. -->
+                                                                        <key>beginHour</key>
+                                                                        <integer>8</integer>
+
+                                                                        <!-- And the latest hour of a day (at which an event will be scheduled
+                                                                                to begin!). -->
+                                                                        <key>endHour</key>
+                                                                        <integer>16</integer>
+
+                                                                        <!-- The timezone in which the event is scheduled. (XXX Does this
+                                                                                really work right?) -->
+                                                                        <key>tzname</key>
+                                                                        <string>America/Los_Angeles</string>
+                                                                </dict>
+                                                        </dict>
+                                                </dict>
+                                        </dict>
+
+                                </array>
+
+                                <!-- Determine the frequency at which this client configuration will
+                                        appear in the clients which are created by the load tester. -->
+                                <key>weight</key>
+                                <integer>1</integer>
+                        </dict>
+                </array>
+        </dict>
+</plist>
</ins></span></pre></div>
<a id="CalendarServertrunkcontribperformanceloadtestconfigoldplist"></a>
<div class="addfile"><h4>Added: CalendarServer/trunk/contrib/performance/loadtest/config-old.plist (0 => 15305)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/contrib/performance/loadtest/config-old.plist         (rev 0)
+++ CalendarServer/trunk/contrib/performance/loadtest/config-old.plist        2015-11-12 00:07:36 UTC (rev 15305)
</span><span class="lines">@@ -0,0 +1,175 @@
</span><ins>+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Copyright (c) 2011-2015 Apple Inc. All rights reserved.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+        <dict>
+                <!-- Identify the server to be load tested. -->
+                <key>server</key>
+                <string>https://localhost:8443</string>
+
+                <!-- The template URI for doing initial principal lookup on. -->
+                <key>principalPathTemplate</key>
+                <string>/principals/users/%s/</string>
+
+                <!-- Configure Admin Web UI. -->
+                <key>webadmin</key>
+                <dict>
+                        <key>enabled</key>
+                        <true/>
+
+                        <key>HTTPPort</key>
+                        <integer>8080</integer>
+                </dict>
+
+                <!-- Define whether server supports stats socket. -->
+                <key>serverStats</key>
+                <dict>
+                        <key>enabled</key>
+                        <true/>
+                        <key>Port</key>
+                        <integer>8100</integer>
+                </dict>
+
+                <!-- Define whether client data should be re-used. It will always be saved to the specified path.-->
+                <key>clientDataSerialization</key>
+                <dict>
+                        <key>UseOldData</key>
+                        <true/>
+                        <key>Path</key>
+                        <string>/tmp/sim</string>
+                </dict>
+
+                <!-- Define the credentials of the clients which will be used to load test
+                        the server. These credentials must already be valid on the server. -->
+                <key>accounts</key>
+                <dict>
+                        <!-- The loader is the fully-qualified Python name of a callable which
+                                returns a list of directory service records defining all of the client accounts
+                                to use. contrib.performance.loadtest.sim.recordsFromCSVFile reads username,
+                                password, mailto triples from a CSV file and returns them as a list of faked
+                                directory service records. -->
+                        <key>loader</key>
+                        <string>contrib.performance.loadtest.sim.recordsFromCSVFile</string>
+
+                        <!-- Keyword arguments may be passed to the loader. -->
+                        <key>params</key>
+                        <dict>
+                                <!-- recordsFromCSVFile interprets the path relative to the config.plist,
+                                        to make it independent of the script's working directory while still allowing
+                                        a relative path. This isn't a great solution. -->
+                                <key>path</key>
+                                <string>contrib/performance/loadtest/accounts.csv</string>
+                        </dict>
+                </dict>
+
+                <!-- Define how many clients will participate in the load test and how
+                        they will show up. -->
+                <key>arrival</key>
+                <dict>
+
+                        <!-- Specify a class which creates new clients and introduces them into
+                                the test. contrib.performance.loadtest.population.SmoothRampUp introduces
+                                groups of new clients at fixed intervals up to a maximum. The size of the
+                                group, interval, and maximum are configured by the parameters below. The
+                                total number of clients is groups * groupSize, which needs to be no larger
+                                than the number of credentials created in the accounts section. -->
+                        <key>factory</key>
+                        <string>contrib.performance.loadtest.population.SmoothRampUp</string>
+
+                        <key>params</key>
+                        <dict>
+                                <!-- groups gives the total number of groups of clients to introduce. -->
+                                <key>groups</key>
+                                <integer>20</integer>
+
+                                <!-- groupSize is the number of clients in each group of clients. It's
+                                        really only a "smooth" ramp up if this is pretty small. -->
+                                <key>groupSize</key>
+                                <integer>1</integer>
+
+                                <!-- Number of seconds between the introduction of each group. -->
+                                <key>interval</key>
+                                <integer>3</integer>
+
+                                <!-- Number of clients each user is assigned to. -->
+                                <!-- Set weight of clients to 1 if this is > 1. Number of clients must match this value if > 1. -->
+                                <key>clientsPerUser</key>
+                                <integer>1</integer>
+                        </dict>
+
+                </dict>
+
+                <!-- Define some log observers to report on the load test. -->
+                <key>observers</key>
+                <array>
+                        <!-- ReportStatistics generates an end-of-run summary of the HTTP requests
+                                made, their timings, and their results. -->
+                        <dict>
+                                <key>type</key>
+                                <string>contrib.performance.loadtest.population.ReportStatistics</string>
+                                <key>params</key>
+                                <dict>
+                                        <!-- The thresholds for each request type -->
+                                        <key>thresholdsPath</key>
+                                        <string>contrib/performance/loadtest/thresholds.json</string>
+
+                                        <!-- The benchmarks for overall QoS -->
+                                        <key>benchmarksPath</key>
+                                        <string>contrib/performance/loadtest/benchmarks.json</string>
+
+                                        <!-- The % of failures that constitute a failed test -->
+                                        <key>failCutoff</key>
+                                        <real>1.0</real>
+                                </dict>
+                        </dict>
+
+                        <!-- RequestLogger generates a realtime log of all HTTP requests made
+                                during the load test. -->
+                        <dict>
+                                <key>type</key>
+                                <string>contrib.performance.loadtest.ical.RequestLogger</string>
+                                <key>params</key>
+                                <dict>
+                                </dict>
+                        </dict>
+
+                        <!-- OperationLogger generates an end-of-run summary of the gross operations
+                                performed (logical operations which may span more than one HTTP request,
+                                such as inviting an attendee to an event). -->
+                        <dict>
+                                <key>type</key>
+                                <string>contrib.performance.loadtest.profiles.OperationLogger</string>
+                                <key>params</key>
+                                <dict>
+                                        <!-- The thresholds for each operation type -->
+                                        <key>thresholdsPath</key>
+                                        <string>contrib/performance/loadtest/thresholds.json</string>
+
+                                        <!-- The % of operations beyond the lag cut-off that constitute a failed test -->
+                                        <key>lagCutoff</key>
+                                        <real>1.0</real>
+
+                                        <!-- The % of failures that constitute a failed test -->
+                                        <key>failCutoff</key>
+                                        <real>1.0</real>
+                                </dict>
+                        </dict>
+                </array>
+        </dict>
+</plist>
</ins></span></pre></div>
<a id="CalendarServertrunkcontribperformanceloadtesticalpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/contrib/performance/loadtest/ical.py (15304 => 15305)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/contrib/performance/loadtest/ical.py        2015-11-10 17:55:25 UTC (rev 15304)
+++ CalendarServer/trunk/contrib/performance/loadtest/ical.py        2015-11-12 00:07:36 UTC (rev 15305)
</span><span class="lines">@@ -253,6 +253,7 @@
</span><span class="cx"> calendar.changeToken = ""
</span><span class="cx"> return calendar
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> @staticmethod
</span><span class="cx"> def addInviteeXML(uid, summary, readwrite=True):
</span><span class="cx"> return AddInvitees(None, '/', [uid], readwrite, summary=summary).request_data.text
</span><span class="lines">@@ -274,6 +275,7 @@
</span><span class="cx"> self.notifications = {}
</span><span class="cx"> self.name = "notification"
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def serialize(self):
</span><span class="cx"> """
</span><span class="cx"> Create a dict of the data so we can serialize as JSON.
</span><span class="lines">@@ -474,6 +476,8 @@
</span><span class="cx"> _USER_LIST_PRINCIPAL_PROPERTY_SEARCH = None
</span><span class="cx"> _POST_AVAILABILITY = None
</span><span class="cx">
</span><ins>+ _CALENDARSERVER_PRINCIPAL_SEARCH_REPORT = None
+
</ins><span class="cx"> email = None
</span><span class="cx">
</span><span class="cx"> def __init__(
</span><span class="lines">@@ -527,7 +531,10 @@
</span><span class="cx"> self.serializePath = serializePath
</span><span class="cx">
</span><span class="cx"> self.supportSync = self._SYNC_REPORT
</span><ins>+ self.supportNotificationSync = self._NOTIFICATION_SYNC_REPORT
</ins><span class="cx">
</span><ins>+ self.supportEnhancedAttendeeAutoComplete = self._CALENDARSERVER_PRINCIPAL_SEARCH_REPORT
+
</ins><span class="cx"> # Keep track of the calendars on this account, keys are
</span><span class="cx"> # Calendar URIs, values are Calendar instances.
</span><span class="cx"> self._calendars = {}
</span><span class="lines">@@ -1129,7 +1136,7 @@
</span><span class="cx">
</span><span class="cx"> fullSync = not oldToken
</span><span class="cx">
</span><del>- # Get the list of notificatinon xml resources
</del><ins>+ # Get the list of notification xml resources
</ins><span class="cx">
</span><span class="cx"> result = yield self._report(
</span><span class="cx"> self._notificationCollection.url,
</span><span class="lines">@@ -1152,7 +1159,7 @@
</span><span class="cx"> else:
</span><span class="cx"> raise IncorrectResponseCode((MULTI_STATUS,), None)
</span><span class="cx">
</span><del>- result, others = result
</del><ins>+ result, _ignore_others = result
</ins><span class="cx">
</span><span class="cx"> # Scan for the sharing invites
</span><span class="cx"> inviteNotifications = []
</span><span class="lines">@@ -1239,7 +1246,6 @@
</span><span class="cx"> self._notificationCollection.changeToken = newToken
</span><span class="cx">
</span><span class="cx">
</span><del>-
</del><span class="cx"> @inlineCallbacks
</span><span class="cx"> def _poll(self, calendarHomeSet, firstTime):
</span><span class="cx"> """
</span><span class="lines">@@ -1269,23 +1275,21 @@
</span><span class="cx"> yield self._updateCalendar(self._calendars[cal.url], newToken)
</span><span class="cx">
</span><span class="cx"> if notificationCollection is not None:
</span><del>- if self._notificationCollection:
- oldToken = self._notificationCollection.changeToken
</del><ins>+ if self.supportNotificationSync:
+ if self._notificationCollection:
+ oldToken = self._notificationCollection.changeToken
+ else:
+ oldToken = ""
+ self._notificationCollection = notificationCollection
+ newToken = notificationCollection.changeToken
+ yield self._updateNotifications(oldToken, newToken)
</ins><span class="cx"> else:
</span><del>- oldToken = ""
- self._notificationCollection = notificationCollection
- newToken = notificationCollection.changeToken
- yield self._updateNotifications(oldToken, newToken)
</del><ins>+ # When there is no sync REPORT, clients have to do a full PROPFIND
+ # on the notification collection because there is no ctag
+ self._notificationCollection = notificationCollection
+ yield self._notificationPropfind(self._notificationCollection.url)
+ yield self._notificationChangesPropfind(self._notificationCollection.url)
</ins><span class="cx">
</span><del>- # FIXME: isn't sync report the new norm, and therefore we can remove
- # the following?
-
- # # When there is no sync REPORT, clients have to do a full PROPFIND
- # # on the notification collection because there is no ctag
- # if self.notificationURL is not None and not self.supportSync:
- # yield self._notificationPropfind(self.notificationURL)
- # yield self._notificationChangesPropfind(self.notificationURL)
-
</del><span class="cx"> # One time delegate expansion
</span><span class="cx"> if firstTime:
</span><span class="cx"> yield self._pollFirstTime2()
</span><span class="lines">@@ -1663,12 +1667,31 @@
</span><span class="cx"> elif attendee.hasParameter('EMAIL'):
</span><span class="cx"> email = attendee.parameterValue('EMAIL').encode("utf-8")
</span><span class="cx">
</span><del>- search = "<C:search-token>{}</C:search-token>".format(prefix)
- body = self._CALENDARSERVER_PRINCIPAL_SEARCH_REPORT.format(
- context="attendee", searchTokens=search)
- yield self._report(
- '/principals/', body, depth=None, method_label="REPORT{cpsearch}"
- )
</del><ins>+ if self.supportEnhancedAttendeeAutoComplete:
+ # New calendar server enhanced query
+ search = "<C:search-token>{}</C:search-token>".format(prefix)
+ body = self._CALENDARSERVER_PRINCIPAL_SEARCH_REPORT.format(
+ context="attendee", searchTokens=search)
+ yield self._report(
+ self.principalCollection,
+ body,
+ depth=None,
+ method_label="REPORT{cpsearch}",
+ )
+ else:
+ # First try to discover some names to supply to the
+ # auto-completion
+ yield self._report(
+ self.principalCollection,
+ self._USER_LIST_PRINCIPAL_PROPERTY_SEARCH % {
+ 'displayname': prefix,
+ 'email': prefix,
+ 'firstname': prefix,
+ 'lastname': prefix,
+ },
+ depth=None,
+ method_label="REPORT{psearch}",
+ )
</ins><span class="cx">
</span><span class="cx"> # Now learn about the attendee's availability
</span><span class="cx"> yield self.requestAvailability(
</span><span class="lines">@@ -1679,7 +1702,6 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><del>-
</del><span class="cx"> @inlineCallbacks
</span><span class="cx"> def changeEventAttendee(self, href, oldAttendee, newAttendee):
</span><span class="cx"> event = self._events[href]
</span><span class="lines">@@ -1943,6 +1965,7 @@
</span><span class="cx"> returnValue(body)
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class OS_X_10_6(BaseAppleClient):
</span><span class="cx"> """
</span><span class="cx"> Implementation of the OS X 10.6 iCal network behavior.
</span><span class="lines">@@ -2108,6 +2131,7 @@
</span><span class="cx"> returnValue(principal)
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class OS_X_10_11(BaseAppleClient):
</span><span class="cx"> """
</span><span class="cx"> Implementation of the OS X 10.11 Calendar.app network behavior.
</span><span class="lines">@@ -2201,6 +2225,7 @@
</span><span class="cx"> returnValue(principal)
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class iOS_5(BaseAppleClient):
</span><span class="cx"> """
</span><span class="cx"> Implementation of the iOS 5 network behavior.
</span></span></pre>
</div>
</div>
</body>
</html>