[CalendarServer-changes] [9897] CalendarServer/trunk/contrib/performance/loadtest

[source_changes at macosforge.org]

Revision: 9897
          http://trac.calendarserver.org//changeset/9897
Author:   dre at apple.com
Date:     2012-10-05 11:29:42 -0700 (Fri, 05 Oct 2012)
Log Message:
-----------
Quick workaround for RestrictCalendarsToOneComponentType being broken in the server; also correct some distribution parameters, turn the max event size down a little, and disable the tasker profile for now

Modified Paths:
--------------
    CalendarServer/trunk/contrib/performance/loadtest/config.plist
    CalendarServer/trunk/contrib/performance/loadtest/ical.py

Modified: CalendarServer/trunk/contrib/performance/loadtest/config.plist
===================================================================
--- CalendarServer/trunk/contrib/performance/loadtest/config.plist	2012-10-05 16:59:13 UTC (rev 9896)
+++ CalendarServer/trunk/contrib/performance/loadtest/config.plist	2012-10-05 18:29:42 UTC (rev 9897)
@@ -257,55 +257,6 @@
 						</dict>
 					</dict>
 
-					<!-- This profile invites new attendees to existing events.
-					     This profile should no longer be used - use RealisticInviter instead. -->
-					<dict>
-						<key>class</key>
-						<string>contrib.performance.loadtest.profiles.Inviter</string>
-
-						<key>params</key>
-						<dict>
-							<key>enabled</key>
-							<false/>
-
-							<!-- 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. Each
-								set of credentials loaded by the load tester has an index; samples from this
-								distribution will be added to that index to arrive at the index of some other
-								credentials, which will be the target of the invitation. -->
-							<key>inviteeDistanceDistribution</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>-100</integer>
-									<!-- The maximum value (exclusive) of the uniform distribution. -->
-									<key>max</key>
-									<integer>101</integer>
-								</dict>
-							</dict>
-						</dict>
-					</dict>
-
 					<!-- This profile invites some number of new attendees to new events. -->
 					<dict>
 						<key>class</key>
@@ -352,10 +303,10 @@
 								<dict>
 									<!-- The minimum value (inclusive) of the uniform distribution. -->
 									<key>min</key>
-									<integer>-100</integer>
+									<integer>0</integer>
 									<!-- The maximum value (exclusive) of the uniform distribution. -->
 									<key>max</key>
-									<integer>101</integer>
+									<integer>99</integer>
 								</dict>
 							</dict>
 
@@ -385,7 +336,7 @@
 									<integer>6</integer>
 									<!-- maximum -->
 									<key>maximum</key>
-									<real>100</real>
+									<real>60</real>
 								</dict>
 							</dict>
 
@@ -520,7 +471,7 @@
 						<key>params</key>
 						<dict>
 							<key>enabled</key>
-							<true/>
+							<false/>
 
 							<!-- Define the interval (in seconds) at which this profile will use
 								its client to create a new task. -->

Modified: CalendarServer/trunk/contrib/performance/loadtest/ical.py
===================================================================
--- CalendarServer/trunk/contrib/performance/loadtest/ical.py	2012-10-05 16:59:13 UTC (rev 9896)
+++ CalendarServer/trunk/contrib/performance/loadtest/ical.py	2012-10-05 18:29:42 UTC (rev 9897)
@@ -771,7 +771,10 @@
                         if caldavxml.supported_calendar_component_set in nodes:
                             for comp in nodes[caldavxml.supported_calendar_component_set].getchildren():
                                 componentTypes.add(comp.get("name").upper())
-                    
+
+                    if textProps.get(davxml.displayname, None) == "tasks":
+                        # Until we can fix caldavxml.supported_calendar_component_set
+                        break                    
                     changeTag = davxml.sync_token if self.supportSync else csxml.getctag
                     calendars.append(Calendar(
                             nodeType.tag,
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20121005/40d36a8b/attachment.html>