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

[source_changes at macosforge.org]

Revision: 9006
          http://trac.macosforge.org/projects/calendarserver/changeset/9006
Author:   cdaboo at apple.com
Date:     2012-04-10 10:43:49 -0700 (Tue, 10 Apr 2012)
Log Message:
-----------
Fix PROPFIND Depth:1's. 10.7 client uses multiget batch 50. Default to 10.7 client in configs.

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

Modified: CalendarServer/trunk/contrib/performance/loadtest/config.dist.plist
===================================================================
--- CalendarServer/trunk/contrib/performance/loadtest/config.dist.plist	2012-04-10 16:50:13 UTC (rev 9005)
+++ CalendarServer/trunk/contrib/performance/loadtest/config.dist.plist	2012-04-10 17:43:49 UTC (rev 9006)
@@ -105,19 +105,19 @@
 
 			<dict>
 
-				<!-- Here is a Snow Leopard iCal simulator. -->
+				<!-- Here is a OS X client simulator. -->
 				<key>software</key>
-				<string>contrib.performance.loadtest.ical.OS_X_10_6</string>
+				<string>contrib.performance.loadtest.ical.OS_X_10_7</string>
 
-				<!-- Arguments to use to initialize the OS_X_10_6 instance. -->
+				<!-- Arguments to use to initialize the OS_X_10_7 instance. -->
 				<key>params</key>
 				<dict>
-					<!-- OS_X_10_6 can poll the calendar home at some interval. This is 
+					<!-- 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_6 can wait for notifications 
+					<!-- 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 

Modified: CalendarServer/trunk/contrib/performance/loadtest/config.plist
===================================================================
--- CalendarServer/trunk/contrib/performance/loadtest/config.plist	2012-04-10 16:50:13 UTC (rev 9005)
+++ CalendarServer/trunk/contrib/performance/loadtest/config.plist	2012-04-10 17:43:49 UTC (rev 9006)
@@ -93,19 +93,19 @@
 
 			<dict>
 
-				<!-- Here is a Snow Leopard iCal simulator. -->
+				<!-- Here is a OS X client simulator. -->
 				<key>software</key>
-				<string>contrib.performance.loadtest.ical.OS_X_10_6</string>
+				<string>contrib.performance.loadtest.ical.OS_X_10_7</string>
 
-				<!-- Arguments to use to initialize the OS_X_10_6 instance. -->
+				<!-- Arguments to use to initialize the OS_X_10_7 instance. -->
 				<key>params</key>
 				<dict>
-					<!-- OS_X_10_6 can poll the calendar home at some interval. This is 
+					<!-- 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_6 can wait for notifications 
+					<!-- 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 

Modified: CalendarServer/trunk/contrib/performance/loadtest/ical.py
===================================================================
--- CalendarServer/trunk/contrib/performance/loadtest/ical.py	2012-04-10 16:50:13 UTC (rev 9005)
+++ CalendarServer/trunk/contrib/performance/loadtest/ical.py	2012-04-10 17:43:49 UTC (rev 9006)
@@ -586,7 +586,7 @@
 
         result = yield self._propfind(
             calendar.url,
-            self._POLL_CALENDAR_PROPFIND,
+            self._POLL_CALENDAR_PROPFIND_D1,
             depth='1',
             method_label="PROPFIND{calendar}"
         )
@@ -1302,7 +1302,7 @@
     CALENDAR_HOME_POLL_INTERVAL = 15 * 60
     
     # The maximum number of resources to retrieve in a single multiget
-    MULTIGET_BATCH_SIZE = 200
+    MULTIGET_BATCH_SIZE = 50
 
     # Override and turn on if client supports Sync REPORT
     _SYNC_REPORT = True
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120410/64467b98/attachment-0001.html>