From 5a111174466c8adbceda1b57465873822028c0cb Mon Sep 17 00:00:00 2001 From: =?utf8?q?Michal=20Voc=C5=AF?= Date: Fri, 19 Jun 2009 13:12:07 +0000 Subject: [PATCH] purge directly in database --- org.glite.lb.server/src/perftest_proxy.sh | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/org.glite.lb.server/src/perftest_proxy.sh b/org.glite.lb.server/src/perftest_proxy.sh index d9e9852..706328b 100755 --- a/org.glite.lb.server/src/perftest_proxy.sh +++ b/org.glite.lb.server/src/perftest_proxy.sh @@ -10,6 +10,9 @@ LOGEVENT=${LOGEVENT:-$GLITE_LOCATION/bin/glite-lb-logevent} DEBUG=${DEBUG:-0} +DBNAME=${DBNAME:-lbserver20} +export LBDB=lbserver/@localhost:$DBNAME + SILENT=0 while getopts "t:n:s" OPTION do @@ -40,8 +43,13 @@ purge_proxy () { for jobid in $@ do - $LOGEVENT -x -S /tmp/proxy.perfstore.sock -c $SEQCODE -j $jobid -s UserInterface -e Abort --reason Purge > /dev/null 2>&1 - done + cat < /dev/null 2>&1 + done | mysql -u lbserver $DBNAME } group_a () { @@ -72,11 +80,11 @@ group_a_test_n () print_result # purge jobs from database # we have to start proxy again - $PERFTEST_CONSUMER -P -d -o /tmp/proxy.perf -D /tmp -t 1 >/dev/null 2>&1 & - PID=$! + #$PERFTEST_CONSUMER -P -d -o /tmp/proxy.perf -D /tmp -t 1 >/dev/null 2>&1 & + #PID=$! purge_proxy `for file in ${JOB_FILE[*]}; do $LOGJOBS -f $file -n $numjobs; done | sort | uniq` - sleep 2 - shutdown $PID + #sleep 2 + #shutdown $PID } group_a_test_5 () @@ -90,11 +98,11 @@ group_a_test_5 () echo -n "5)" run_test proxy $numjobs print_result - $PERFTEST_COMPONENT -P -d -o /tmp/proxy.perf -t 1 -D /tmp >/dev/null 2>&1 & - PID=$! + #$PERFTEST_COMPONENT -P -d -o /tmp/proxy.perf -t 1 -D /tmp >/dev/null 2>&1 & + #PID=$! purge_proxy `for file in ${JOB_FILE[*]}; do $LOGJOBS -f $file -n $numjobs; done | sort | uniq` - sleep 2 - shutdown $PID + #sleep 2 + #shutdown $PID rm -f /tmp/perftest.log.* } -- 1.8.2.3