Author: angela
Date: Wed Nov 6 17:09:46 2013
New Revision: 1539400
URL: http://svn.apache.org/r1539400
Log:
OAK-527: benchmark script: minor improvement
Modified:
jackrabbit/oak/trunk/oak-run/run_concurrent.sh
Modified: jackrabbit/oak/trunk/oak-run/run_concurrent.sh
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/run_concurrent.sh?rev=1539400&r1=1539399&r2=1539400&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/run_concurrent.sh (original)
+++ jackrabbit/oak/trunk/oak-run/run_concurrent.sh Wed Nov 6 17:09:46 2013
@@ -15,17 +15,17 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
+TITLE=ConcurrentReadAccessControlledTreeTest
+BENCH="ConcurrentReadAccessControlledTreeTest"
#ConcurrentReadAccessControlledTreeTest2 ConcurrentReadSinglePolicyTreeTest
ManyUserReadTest ConcurrentTraversalTest"
ADMIN="false true"
RUNTIME=10
-#BENCH=ConcurrentReadAccessControlledTreeTest
-BENCH=ManyUserReadTest
RANDOM_USER="true"
FIXS="Oak-Tar Jackrabbit"
THREADS="1,2,4,8,10,15,20,50"
PROFILE=false
NUM_ITEMS=10000
-LOG=$BENCH"_$(date +'%Y%m%d_%H%M%S').csv"
+LOG=$TITLE"_$(date +'%Y%m%d_%H%M%S').csv"
echo "Benchmarks: $BENCH" > $LOG
echo "Fixtures: $FIXS" >> $LOG
echo "Admin User: $ADMIN" >> $LOG
@@ -35,17 +35,21 @@ echo "Concurrency: $THREADS" >> $LOG
echo "Random User: $RANDOM_USER" >> $LOG
echo "Profiling: $PROFILE" >> $LOG
echo "--------------------------------------" >> $LOG
-for user in $ADMIN
+
+for bm in $BENCH
do
- # we start new VMs for each fixture to minimize memory impacts between them
- for fix in $FIXS
- do
- echo "Executing benchmarks as admin: $user on $fix" | tee -a $LOG
- echo "-----------------------------------------------------------" |
tee -a $LOG
- rm -rf target/Jackrabbit-* target/Oak-Tar-*
- cmd="java -Xmx2048m -Dprofile=$PROFILE -Druntime=$RUNTIME -Dwarmup=20
-jar target/oak-run-*-SNAPSHOT.jar benchmark --itemsToRead $NUM_ITEMS --csvFile
$LOG --concurrency $THREADS --runAsAdmin $user --report false --randomUser
$RANDOM_USER $BENCH $fix"
- echo $cmd
- $cmd
+ for user in $ADMIN
+ do
+ # we start new VMs for each fixture to minimize memory impacts between
them
+ for fix in $FIXS
+ do
+ echo "Executing benchmarks as admin: $user on $fix" | tee -a $LOG
+ echo "-----------------------------------------------------------" |
tee -a $LOG
+ rm -rf target/Jackrabbit-* target/Oak-Tar-*
+ cmd="java -Xmx2048m -Dprofile=$PROFILE -Druntime=$RUNTIME
-Dwarmup=20 -jar target/oak-run-*-SNAPSHOT.jar benchmark --itemsToRead
$NUM_ITEMS --csvFile $LOG --concurrency $THREADS --runAsAdmin $user --report
false --randomUser $RANDOM_USER $bm $fix"
+ echo $cmd
+ $cmd
+ done
done
done
echo "-----------------------------------------"
