"Megajob" perftest updates.

diff --git a/org.glite.lb.client/src/perftest_query.sh b/org.glite.lb.client/src/perftest_query.sh
index dbbd7f9..de960d6 100644 (file)
--- a/org.glite.lb.client/src/perftest_query.sh
+++ b/org.glite.lb.client/src/perftest_query.sh
@@ -20,13 +20,17 @@ clients=${1:-3}
 
 jobs=${2:-/tmp/perftest_10.jobids}
 
-# XXX - there must be better way to find stage
 if [ -z "${GLITE_LOCATION}" ]; then
-        STAGEDIR=/home/michal/shared/egee/jra1-head/stage
+       # let's be in stage
+        STAGEDIR=`pwd`/stage/usr
 else
         STAGEDIR=${GLITE_LOCATION}
 fi
-JOBSTAT=$STAGEDIR/examples/glite-lb-job_status
+for dir in $STAGEDIR/lib/glite-lb/examples $STAGEDIR/lib64/glite-lb/examples; do
+       EXAMPLES=$dir
+       if test -d $dir; then break; fi
+done
+JOBSTAT=$EXAMPLES/glite-lb-job_status
 
 ask() {
        $JOBSTAT `cat $jobs`

diff --git a/org.glite.lb.common/src/perftest_common.sh b/org.glite.lb.common/src/perftest_common.sh
index 656e8b2..cfc1525 100644 (file)
--- a/org.glite.lb.common/src/perftest_common.sh
+++ b/org.glite.lb.common/src/perftest_common.sh
@@ -22,15 +22,19 @@
 
 if [[ -z $JOB_FILE ]]
 then
-    JOB_FILE[0]=$STAGEDIR/examples/perftest/perf_simple_avg_events.log
+    for dir in $STAGEDIR/lib/glite-lb/examples $STAGEDIR/lib64/glite-lb/examples; do
+       EXAMPLES=$dir
+       if test -d $dir; then break; fi
+    done
+    JOB_FILE[0]=$EXAMPLES/perftest/perf_simple_avg_events.log
     JOB_DESC[0]="avg_job"
-    JOB_FILE[1]=$STAGEDIR/examples/perftest/perf_simple_max_events.log
+    JOB_FILE[1]=$EXAMPLES/perftest/perf_simple_max_events.log
     JOB_DESC[1]="big_job"
-    JOB_FILE[2]=$STAGEDIR/examples/perftest/perf_dag_avg_events.log
+    JOB_FILE[2]=$EXAMPLES/perftest/perf_dag_avg_events.log
     JOB_DESC[2]="avg_dag"
-    JOB_FILE[3]=$STAGEDIR/examples/perftest/perf_dag_max_events.log
+    JOB_FILE[3]=$EXAMPLES/perftest/perf_dag_max_events.log
     JOB_DESC[3]="big_dag"
-    JOB_FILE[4]=$STAGEDIR/examples/perftest/perf_collection_avg_events.log
+    JOB_FILE[4]=$EXAMPLES/perftest/perf_collection_avg_events.log
     JOB_DESC[4]="collection"
 fi
 

diff --git a/org.glite.lb.logger/src/perftest_il.sh b/org.glite.lb.logger/src/perftest_il.sh
index c1039ff..268cc6c 100644 (file)
--- a/org.glite.lb.logger/src/perftest_il.sh
+++ b/org.glite.lb.logger/src/perftest_il.sh
@@ -19,9 +19,9 @@
 numjobs=10
 parallel=1
 
-# XXX - there must be better way to find stage
 if [ -z "${GLITE_LOCATION}" ]; then
-       STAGEDIR=/home/michal/shared/egee/jra1-head/stage
+       # let's be in stage
+       STAGEDIR=`pwd`/usr
 else
        STAGEDIR=${GLITE_LOCATION}
 fi
@@ -277,7 +277,7 @@ echo ""
 fi
 
 PERFTEST_CONSUMER=$STAGEDIR/bin/glite-lb-bkserverd
-CONSUMER_ARGS="-g --silent -S /tmp -D /tmp -t 1 -d --perf-sink=1 -p 10500 -w 10503"
+CONSUMER_ARGS="-g -S /tmp -D /tmp -t 1 -d --perf-sink=1 -p 10500 -w 10503"
 PERFTEST_COMPONENT=$STAGEDIR/bin/glite-lb-interlogd-perf
 LOGJOBS_ARGS=" -m localhost:10500 $COMM_ARGS"
 }

diff --git a/org.glite.lb.logger/src/perftest_ll.sh b/org.glite.lb.logger/src/perftest_ll.sh
index d8eec47..07cac81 100644 (file)
--- a/org.glite.lb.logger/src/perftest_ll.sh
+++ b/org.glite.lb.logger/src/perftest_ll.sh
@@ -18,9 +18,9 @@
 
 numjobs=1
 
-# XXX - there must be better way to find stage
 if [ -z "${GLITE_LOCATION}" ]; then
-       STAGEDIR=/home/michal/shared/egee/jra1-head/stage
+       # let's be in stage
+       STAGEDIR=`pwd`/usr
 else
        STAGEDIR=${GLITE_LOCATION}
 fi

diff --git a/org.glite.lb.server/src/perftest_proxy.sh b/org.glite.lb.server/src/perftest_proxy.sh
index bee512f..dc28a48 100755 (executable)
--- a/org.glite.lb.server/src/perftest_proxy.sh
+++ b/org.glite.lb.server/src/perftest_proxy.sh
@@ -90,7 +90,7 @@ group_a_test_n ()
 {
     PERFTEST_CONSUMER=$GLITE_LOCATION/bin/glite-lb-bkserverd
     i=$1
-    CONSUMER_ARGS="-P -d --silent --perf-sink $i -o /tmp/proxy.perf -D /tmp -t 1 " 
+    CONSUMER_ARGS="-P -d --perf-sink $i -o /tmp/proxy.perf -D /tmp -t 1 " 
     export PERFTEST_NAME="proxy_test_$i"
     echo -n "${i})"
     run_test proxy $numjobs
@@ -107,7 +107,7 @@ group_a_test_n ()
 group_a_test_5 ()
 {
     PERFTEST_COMPONENT="$GLITE_LOCATION/bin/glite-lb-bkserverd"
-    COMPONENT_ARGS="-P -d --silent -o /tmp/proxy.perf --proxy-il-sock /tmp/interlogger.perf  --proxy-il-fprefix /tmp/perftest.log -D /tmp -t 1 "
+    COMPONENT_ARGS="-P -d -o /tmp/proxy.perf --proxy-il-sock /tmp/interlogger.perf  --proxy-il-fprefix /tmp/perftest.log -D /tmp -t 1 "
 
     PERFTEST_CONSUMER="$GLITE_LOCATION/bin/glite-lb-interlogd-perf-empty"
     CONSUMER_ARGS="-d -s /tmp/interlogger.perf --file-prefix=/tmp/perftest.log -i /tmp/il-perf.pid"
@@ -126,7 +126,7 @@ group_a_test_5 ()
 group_a_test_6 ()
 {
     PERFTEST_COMPONENT="$GLITE_LOCATION/bin/glite-lb-bkserverd"
-    COMPONENT_ARGS="-P -d --silent -o /tmp/proxy.perf --proxy-il-sock /tmp/interlogger.perf  --proxy-il-fprefix /tmp/perftest.log -D /tmp -t 1 "
+    COMPONENT_ARGS="-P -d -o /tmp/proxy.perf --proxy-il-sock /tmp/interlogger.perf  --proxy-il-fprefix /tmp/perftest.log -D /tmp -t 1 "
 
     PERFTEST_CONSUMER="$GLITE_LOCATION/bin/glite-lb-interlogd-perf"
     CONSUMER_ARGS="-d --nosend -s /tmp/interlogger.perf --file-prefix=/tmp/perftest.log -i /tmp/il-perf.pid"