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

[source_changes at macosforge.org]

Revision: 7228
          http://trac.macosforge.org/projects/calendarserver/changeset/7228
Author:   exarkun at twistedmatrix.com
Date:     2011-03-21 11:38:34 -0700 (Mon, 21 Mar 2011)
Log Message:
-----------
Fix a case where no previous benchmark run has left a -dev config lying around

Modified Paths:
--------------
    CalendarServer/trunk/contrib/performance/benchlib.sh
    CalendarServer/trunk/contrib/performance/profile.sh
    CalendarServer/trunk/contrib/performance/sample.sh

Modified: CalendarServer/trunk/contrib/performance/benchlib.sh
===================================================================
--- CalendarServer/trunk/contrib/performance/benchlib.sh	2011-03-19 00:48:23 UTC (rev 7227)
+++ CalendarServer/trunk/contrib/performance/benchlib.sh	2011-03-21 18:38:34 UTC (rev 7228)
@@ -18,7 +18,7 @@
 shopt -s nullglob # Expand foo* to nothing if nothing matches
 
 # Names of database backends that can be benchmarked.
-BACKENDS="filesystem postgresql"
+BACKENDS=(filesystem postgresql)
 
 # Location of the CalendarServer source.  Will automatically be
 # updated to the appropriate version, config edited to use the right

Modified: CalendarServer/trunk/contrib/performance/profile.sh
===================================================================
--- CalendarServer/trunk/contrib/performance/profile.sh	2011-03-19 00:48:23 UTC (rev 7227)
+++ CalendarServer/trunk/contrib/performance/profile.sh	2011-03-21 18:38:34 UTC (rev 7228)
@@ -29,7 +29,7 @@
 update_and_build $REV
 
 DATE="`./svn-committime $SOURCE $REV`"
-for backend in $BACKENDS; do
+for backend in ${BACKENDS[*]}; do
   setbackend $backend
   for benchmark in $BENCHMARKS; do
       pushd $SOURCE

Modified: CalendarServer/trunk/contrib/performance/sample.sh
===================================================================
--- CalendarServer/trunk/contrib/performance/sample.sh	2011-03-19 00:48:23 UTC (rev 7227)
+++ CalendarServer/trunk/contrib/performance/sample.sh	2011-03-21 18:38:34 UTC (rev 7228)
@@ -24,6 +24,10 @@
 SOURCE_DIR="$2"
 RESULTS="$3"
 
+# Just force the conf file to be written.  We need it to use start and
+# stop, even if it doesn't have a meaningful backend set.
+setbackend ${BACKENDS[0]}
+
 update_and_build "$REV_SPEC"
 REV="$(./svn-revno "$SOURCE_DIR")"
 
@@ -34,7 +38,7 @@
 fi
 
 DATE="`./svn-committime $SOURCE $REV`"
-for backend in $BACKENDS; do
+for backend in ${BACKENDS[*]}; do
   setbackend $backend
   pushd $SOURCE
   stop
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110321/85fcbc98/attachment.html>