[CalendarServer-changes] [6922] CalendarServer/trunk/contrib/performance

[source_changes at macosforge.org]

Revision: 6922
          http://trac.macosforge.org/projects/calendarserver/changeset/6922
Author:   exarkun at twistedmatrix.com
Date:     2011-02-14 10:35:56 -0800 (Mon, 14 Feb 2011)
Log Message:
-----------
Make the uploader independent of the scaling parameters used for each benchmark.  Discover the correct values from the recorded data.

Modified Paths:
--------------
    CalendarServer/trunk/contrib/performance/benchmark.py
    CalendarServer/trunk/contrib/performance/massupload.py
    CalendarServer/trunk/contrib/performance/sample.sh

Modified: CalendarServer/trunk/contrib/performance/benchmark.py
===================================================================
--- CalendarServer/trunk/contrib/performance/benchmark.py	2011-02-14 17:27:44 UTC (rev 6921)
+++ CalendarServer/trunk/contrib/performance/benchmark.py	2011-02-14 18:35:56 UTC (rev 6922)
@@ -327,7 +327,7 @@
     # sample size) for very slow benchmarks, but the error isn't as
     # interesting as the fact that a single operation takes
     # double-digit seconds or longer to complete.
-    sampleTime = 60 / 2
+    sampleTime = 60 * 2
 
     statistics = {}
 

Modified: CalendarServer/trunk/contrib/performance/massupload.py
===================================================================
--- CalendarServer/trunk/contrib/performance/massupload.py	2011-02-14 17:27:44 UTC (rev 6921)
+++ CalendarServer/trunk/contrib/performance/massupload.py	2011-02-14 18:35:56 UTC (rev 6922)
@@ -27,7 +27,6 @@
 class MassUploadOptions(UploadOptions):
     optParameters = [
         ("benchmarks", None, None, ""),
-        ("parameters", None, None, ""),
         ("statistics", None, None, "")]
 
     opt_statistic = None
@@ -55,7 +54,7 @@
 
     def go():
         for benchmark in benchmarks:
-            for param in options['parameters'].split():
+            for param in raw[benchmark].keys():
                 for statistic in options['statistics'].split():
                     stat, samples = select(
                         raw, benchmark, param, statistic)

Modified: CalendarServer/trunk/contrib/performance/sample.sh
===================================================================
--- CalendarServer/trunk/contrib/performance/sample.sh	2011-02-14 17:27:44 UTC (rev 6921)
+++ CalendarServer/trunk/contrib/performance/sample.sh	2011-02-14 18:35:56 UTC (rev 6922)
@@ -46,7 +46,6 @@
       --url $ADDURL --revision $REV \
       --revision-date "$DATE" --environment nmosbuilder \
       --backend $backend \
-      --parameters "1 9 81" \
       --statistics "${STATISTICS[*]}" \
       $data
   mv $data $RESULTS
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110214/6cdcd3f7/attachment.html>