[CalendarServer-changes] [15729] CalendarServer/trunk

source_changes at macosforge.org source_changes at macosforge.org
Thu Jun 30 14:01:44 PDT 2016


Revision: 15729
          http://trac.calendarserver.org//changeset/15729
Author:   sagen at apple.com
Date:     2016-06-30 14:01:44 -0700 (Thu, 30 Jun 2016)
Log Message:
-----------
When running testsim (and testpodssim), use "accelerated" client activity profiles

Modified Paths:
--------------
    CalendarServer/trunk/bin/testpodssim
    CalendarServer/trunk/bin/testsim

Added Paths:
-----------
    CalendarServer/trunk/contrib/performance/loadtest/standard-configs/accelerated-activity-clients.plist
    CalendarServer/trunk/contrib/performance/loadtest/standard-configs/accelerated-activity-config.plist

Modified: CalendarServer/trunk/bin/testpodssim
===================================================================
--- CalendarServer/trunk/bin/testpodssim	2016-06-30 17:00:17 UTC (rev 15728)
+++ CalendarServer/trunk/bin/testpodssim	2016-06-30 21:01:44 UTC (rev 15729)
@@ -33,8 +33,8 @@
 ##
 
    verbose="";
-    config="${wd}/contrib/performance/loadtest/config.plist";
-   clients="${wd}/contrib/performance/loadtest/clients.plist";
+    config="${wd}/contrib/performance/loadtest/standard-configs/accelerated-activity-config.plist";
+   clients="${wd}/contrib/performance/loadtest/standard-configs/accelerated-activity-clients.plist";
    runtime="--runtime 300";
    logfile="";
 

Modified: CalendarServer/trunk/bin/testsim
===================================================================
--- CalendarServer/trunk/bin/testsim	2016-06-30 17:00:17 UTC (rev 15728)
+++ CalendarServer/trunk/bin/testsim	2016-06-30 21:01:44 UTC (rev 15729)
@@ -33,8 +33,8 @@
 ##
 
    verbose="";
-    config="${wd}/contrib/performance/loadtest/config.plist";
-   clients="${wd}/contrib/performance/loadtest/clients.plist";
+    config="${wd}/contrib/performance/loadtest/standard-configs/accelerated-activity-config.plist";
+   clients="${wd}/contrib/performance/loadtest/standard-configs/accelerated-activity-clients.plist";
    runtime="--runtime 300";
    logfile="";
 

Added: CalendarServer/trunk/contrib/performance/loadtest/standard-configs/accelerated-activity-clients.plist
===================================================================
--- CalendarServer/trunk/contrib/performance/loadtest/standard-configs/accelerated-activity-clients.plist	                        (rev 0)
+++ CalendarServer/trunk/contrib/performance/loadtest/standard-configs/accelerated-activity-clients.plist	2016-06-30 21:01:44 UTC (rev 15729)
@@ -0,0 +1,835 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+    Copyright (c) 2011-2016 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_11</string>
+
+				<!-- Arguments to use to initialize the OS_X_10_11 instance. -->
+				<key>params</key>
+				<dict>
+					<!-- Name that appears in logs. -->
+					<key>title</key>
+					<string>main</string>
+
+					<!-- OS_X_10_11 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>
+					<true/>
+
+					<key>supportAmpPush</key>
+					<true/>
+
+					<key>unauthenticatedPercentage</key>
+					<integer>40</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>120</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>
+
+							<!-- Percentage of time to attach a file -->
+							<key>fileAttachPercentage</key>
+							<integer>1</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 bytes). -->
+									<key>mu</key>
+									<integer>500000</integer>
+
+									<!-- and sigma gives its standard deviation. -->
+									<key>sigma</key>
+									<integer>100000</integer>
+								</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>
+							<true/>
+
+							<!-- 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 changes the description -->
+					<dict>
+						<key>class</key>
+						<string>contrib.performance.loadtest.profiles.DescriptionChanger</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>120</integer>
+
+							<!-- Define the description length distribution. -->
+							<key>descriptionLengthDistribution</key>
+							<dict>
+								<key>type</key>
+								<string>contrib.performance.stats.LogNormalDistribution</string>
+								<key>params</key>
+								<dict>
+									<!-- mode - peak-->
+									<key>mode</key>
+									<integer>450</integer>
+									<!-- mean - average-->
+									<key>median</key>
+									<integer>650</integer>
+									<!-- maximum -->
+									<key>maximum</key>
+									<real>1000000</real>
+								</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>
+
+							<!-- Only share a collection with up to this many sharees -->
+							<key>maxSharees</key>
+							<integer>3</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>120</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>6</integer>
+									<!-- mean - average-->
+									<key>median</key>
+									<integer>8</integer>
+									<!-- maximum -->
+									<key>maximum</key>
+									<real>60</real>
+								</dict>
+							</dict>
+
+							<!-- Percentage of time to do a lookup for invitee -->
+							<key>inviteeLookupPercentage</key>
+							<integer>50</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>
+
+							<!-- Percentage of time to attach a file -->
+							<key>fileAttachPercentage</key>
+							<integer>1</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>
+
+					<!-- 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>
+
+
+					<!-- This profile downloads attachments when an event changes. -->
+					<dict>
+						<key>class</key>
+						<string>contrib.performance.loadtest.profiles.AttachmentDownloader</string>
+
+						<key>params</key>
+						<dict>
+							<key>enabled</key>
+							<true/>
+						</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>
+
+
+					<!-- A profile which periodically does calendar-query reports
+						on a random calendar. -->
+					<dict>
+						<key>class</key>
+						<string>contrib.performance.loadtest.profiles.TimeRanger</string>
+
+						<key>params</key>
+						<dict>
+							<key>enabled</key>
+							<true/>
+
+							<!-- Define the interval (in seconds) at which this profile will use
+								its client to run a report. -->
+							<key>interval</key>
+							<integer>300</integer>
+
+						</dict>
+					</dict>
+
+
+					<!-- A profile which periodically does a "deep refresh" of PROPFINDs
+					    on each calendar. -->
+					<dict>
+						<key>class</key>
+						<string>contrib.performance.loadtest.profiles.DeepRefresher</string>
+
+						<key>params</key>
+						<dict>
+							<key>enabled</key>
+							<true/>
+
+							<!-- Define the interval (in seconds) at which this profile will use
+								its client to refresh. -->
+							<key>interval</key>
+							<integer>60</integer>
+
+						</dict>
+					</dict>
+
+					<!-- A profile which will periodically reset itself, as if a user removed
+						and re-added their account. -->
+					<dict>
+						<key>class</key>
+						<string>contrib.performance.loadtest.profiles.Resetter</string>
+
+						<key>params</key>
+						<dict>
+							<key>enabled</key>
+							<false/>
+
+							<!-- Define the interval (in seconds) at which this profile will
+								reset its client. -->
+							<key>interval</key>
+							<integer>600</integer>
+						</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>
+
+			<dict>
+
+				<!-- Here is a more passive OS X client simulator. -->
+				<key>software</key>
+				<string>contrib.performance.loadtest.ical.OS_X_10_11</string>
+
+				<!-- Arguments to use to initialize the OS_X_10_11 instance. -->
+				<key>params</key>
+				<dict>
+					<!-- Name that appears in logs. -->
+					<key>title</key>
+					<string>idle</string>
+
+					<!-- OS_X_10_11 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>
+					<true/>
+
+					<key>supportAmpPush</key>
+					<true/>
+
+					<key>unauthenticatedPercentage</key>
+					<integer>40</integer>
+
+				</dict>
+
+				<!-- The profiles define certain types of user behavior on top of the
+					client software being simulated. -->
+				<key>profiles</key>
+				<array>
+					<!-- This profile downloads attachments when an event changes. -->
+					<dict>
+						<key>class</key>
+						<string>contrib.performance.loadtest.profiles.AttachmentDownloader</string>
+
+						<key>params</key>
+						<dict>
+							<key>enabled</key>
+							<true/>
+						</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>

Added: CalendarServer/trunk/contrib/performance/loadtest/standard-configs/accelerated-activity-config.plist
===================================================================
--- CalendarServer/trunk/contrib/performance/loadtest/standard-configs/accelerated-activity-config.plist	                        (rev 0)
+++ CalendarServer/trunk/contrib/performance/loadtest/standard-configs/accelerated-activity-config.plist	2016-06-30 21:01:44 UTC (rev 15729)
@@ -0,0 +1,241 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+    Copyright (c) 2011-2016 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 all the servers to be load tested. -->
+		<key>servers</key>
+		<dict>
+			<key>PodA</key>
+			<dict>
+				<key>enabled</key>
+				<true/>
+
+				<!-- Identify the server to be load tested. -->
+				<key>uri</key>
+				<string>https://localhost:8443</string>
+
+				<key>ampPushHosts</key>
+				<array>
+					<string>localhost</string>
+			    </array>
+				<key>ampPushPort</key>
+				<integer>62311</integer>
+
+				<!--  Define whether server supports stats socket. -->
+				<key>stats</key>
+				<dict>
+					<key>enabled</key>
+					<true/>
+					<key>Port</key>
+					<integer>8100</integer>
+				</dict>
+			</dict>
+			<key>PodB</key>
+			<dict>
+				<key>enabled</key>
+				<false/>
+
+				<!-- Identify the server to be load tested. -->
+				<key>uri</key>
+				<string>https://localhost:8543</string>
+
+				<key>ampPushHosts</key>
+				<array>
+					<string>localhost</string>
+			    </array>
+				<key>ampPushPort</key>
+				<integer>62312</integer>
+
+				<!--  Define whether server supports stats socket. -->
+				<key>stats</key>
+				<dict>
+					<key>enabled</key>
+					<true/>
+					<key>Port</key>
+					<integer>8101</integer>
+				</dict>
+			</dict>
+		</dict>
+
+		<!-- 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 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>
+
+				<!-- When there are accounts for multiple pods, interleave the accounts for each
+					pod so that the arrival mechanism will cycle clients between each pod. -->
+				<key>interleavePods</key>
+				<true/>
+			</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>10</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>3</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>2</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>
+
+			<!-- ErrorLogger logs the request/response bodies whenever an incorrect
+				response code is received, or if the duration exceeds threshold. -->
+			<dict>
+				<key>type</key>
+				<string>contrib.performance.loadtest.ical.ErrorLogger</string>
+				<key>params</key>
+				<dict>
+					<key>directory</key>
+					<string>/tmp/sim_errors</string>
+					<key>durationThreshold</key>
+					<real>10.0</real>
+				</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>
+
+					<!-- There must be at least one push operation -->
+					<key>failIfNoPush</key>
+					<true/>
+				</dict>
+			</dict>
+		</array>
+	</dict>
+</plist>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20160630/258f55b7/attachment-0001.html>


More information about the calendarserver-changes mailing list