From a1bee45cd316e0270894949b9307d7ce47dede99 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Michal=20Voc=C5=AF?= Date: Fri, 9 Jun 2006 07:11:25 +0000 Subject: [PATCH] * beautify test output * use correct built-in jobid --- org.glite.lb.logger/src/perftest_il.sh | 74 +++++++++++++++++++++++++--------- org.glite.lb.logger/src/server_msg.c | 2 +- 2 files changed, 56 insertions(+), 20 deletions(-) diff --git a/org.glite.lb.logger/src/perftest_il.sh b/org.glite.lb.logger/src/perftest_il.sh index fbae3db..62985eb 100644 --- a/org.glite.lb.logger/src/perftest_il.sh +++ b/org.glite.lb.logger/src/perftest_il.sh @@ -21,7 +21,9 @@ echo "Logging test:" echo " - events sent through IPC and/or files" echo " - events discarded by IL immediately" echo "-------------------------------------------" - +echo "a) events sent only by IPC" +echo "b) events stored to files and sent by IPC" +echo "" echo -e "\tsmall_job \t big_job \t small_dag \t big_dag" @@ -29,11 +31,11 @@ PERFTEST_CONSUMER=$STAGEDIR/bin/glite-lb-interlogd-perf-empty CONSUMER_ARGS="-d $COMM_ARGS" LOGJOBS_ARGS="--nofile $COMM_ARGS" -echo "Only IPC" +echo -n "a)" run_test il $numjobs print_result LOGJOBS_ARGS=" $COMM_ARGS" -echo "IPC & files" +echo -n "b)" run_test il $numjobs print_result rm -f /tmp/perftest.log.* @@ -44,28 +46,36 @@ echo "Interlogger test:" echo " - events sent through IPC only" echo " - events discarded in IL" echo "--------------------------------" +echo "a) disabled event parsing, the server address (jobid) is hardcoded" +echo "b) disabled event synchornization from files" +echo "c) disabled recovery thread" +echo "d) lazy bkserver connection close" +echo "e) normal operation" +echo "" echo -e "\tsmall_job \t big_job \t small_dag \t big_dag" PERFTEST_CONSUMER=$STAGEDIR/bin/glite-lb-interlogd-perf LOGJOBS_ARGS="--nofile $COMM_ARGS" CONSUMER_ARGS="-d --nosend --noparse $COMM_ARGS" -echo "No event parsing" +echo -n "a)" run_test il $numjobs print_result CONSUMER_ARGS="-d --nosend --nosync $COMM_ARGS" -echo "No checking of event files" +echo -n "b)" run_test il $numjobs print_result CONSUMER_ARGS="-d --nosend --norecover $COMM_ARGS" -echo "No recovery thread" +echo -n "c)" run_test il $numjobs print_result +echo "d) this test is not yet implemented" + CONSUMER_ARGS="-d --nosend $COMM_ARGS" -echo "Normal operation:" +echo -n "e)" run_test il $numjobs print_result @@ -74,31 +84,39 @@ echo "Interlogger test:" echo " - events sent through IPC & files" echo " - events discarded in IL" echo "-----------------------------------" +echo "a) disabled event parsing, the server address (jobid) is hardcoded" +echo "b) disabled event synchornization from files" +echo "c) disabled recovery thread" +echo "d) lazy bkserver connection close" +echo "e) normal operation" +echo "" echo -e "\tsmall_job \t big_job \t small_dag \t big_dag" PERFTEST_CONSUMER=$STAGEDIR/bin/glite-lb-interlogd-perf LOGJOBS_ARGS=" $COMM_ARGS" CONSUMER_ARGS="-d --nosend --noparse $COMM_ARGS" -echo "No event parsing" +echo -n "a)" run_test il $numjobs print_result rm -f /tmp/perftest.log.* CONSUMER_ARGS="-d --nosend --nosync $COMM_ARGS" -echo "No checking of event files" +echo -n "b)" run_test il $numjobs print_result rm -f /tmp/perftest.log.* CONSUMER_ARGS="-d --nosend --norecover $COMM_ARGS" -echo "No recovery thread" +echo -n "c)" run_test il $numjobs print_result rm -f /tmp/perftest.log.* +echo "d) this test is not yet imlemented" + CONSUMER_ARGS="-d --nosend $COMM_ARGS" -echo "Normal operation:" +echo -n "e)" run_test il $numjobs print_result rm -f /tmp/perftest.log.* @@ -109,6 +127,13 @@ echo "Interlogger test:" echo " - events sent through IPC" echo " - events consumed by empty BS" echo "-------------------------------" +echo "a) disabled event parsing, the server address (jobid) is hardcoded" +echo "b) disabled event synchornization from files" +echo "c) disabled recovery thread" +echo "d) lazy bkserver connection close" +echo "e) normal operation" +echo "" +echo -e "\tsmall_job \t big_job \t small_dag \t big_dag" PERFTEST_CONSUMER=$STAGEDIR/bin/glite-lb-bkserverd CONSUMER_ARGS="-d --perf-sink=1" @@ -117,25 +142,27 @@ LOGJOBS_ARGS="--nofile $COMM_ARGS" COMPONENT_ARGS="-d --noparse $COMM_ARGS" -echo "No event parsing" +echo -n "a)" run_test il $numjobs print_result rm -f /tmp/perftest.log.* COMPONENT_ARGS="-d --nosync $COMM_ARGS" -echo "No checking of event files" +echo -n "b)" run_test il $numjobs print_result rm -f /tmp/perftest.log.* COMPONENT_ARGS="-d --norecover $COMM_ARGS" -echo "No recovery thread" +echo -n "c)" run_test il $numjobs print_result rm -f /tmp/perftest.log.* +echo "d) this test is not yet implemented" + COMPONENT_ARGS="-d $COMM_ARGS" -echo "Normal operation:" +echo -n "e)" run_test il $numjobs print_result rm -f /tmp/perftest.log.* @@ -146,6 +173,13 @@ echo "Interlogger test:" echo " - events sent through IPC & files" echo " - events consumed by empty BS" echo "-----------------------------------" +echo "a) disabled event parsing, the server address (jobid) is hardcoded" +echo "b) disabled event synchornization from files" +echo "c) disabled recovery thread" +echo "d) lazy bkserver connection close" +echo "e) normal operation" +echo "" +echo -e "\tsmall_job \t big_job \t small_dag \t big_dag" PERFTEST_CONSUMER=$STAGEDIR/bin/glite-lb-bkserverd CONSUMER_ARGS="-d --perf-sink=1" @@ -154,25 +188,27 @@ LOGJOBS_ARGS=" $COMM_ARGS" COMPONENT_ARGS="-d --noparse $COMM_ARGS" -echo "No event parsing" +echo -n "a)" run_test il $numjobs print_result rm -f /tmp/perftest.log.* COMPONENT_ARGS="-d --nosync $COMM_ARGS" -echo "No checking of event files" +echo -n "b)" run_test il $numjobs print_result rm -f /tmp/perftest.log.* COMPONENT_ARGS="-d --norecover $COMM_ARGS" -echo "No recovery thread" +echo -n "c)" run_test il $numjobs print_result rm -f /tmp/perftest.log.* +echo "d) this test is not yet implemented" + COMPONENT_ARGS="-d $COMM_ARGS" -echo "Normal operation:" +echo -n "e)" run_test il $numjobs print_result rm -f /tmp/perftest.log.* diff --git a/org.glite.lb.logger/src/server_msg.c b/org.glite.lb.logger/src/server_msg.c index 51c8911..a35554f 100644 --- a/org.glite.lb.logger/src/server_msg.c +++ b/org.glite.lb.logger/src/server_msg.c @@ -168,7 +168,7 @@ server_msg_init(struct server_msg *msg, il_octet_string_t *event) } #ifdef LB_PERF if(noparse) { - msg->job_id_s = strdup("https://localhost:9001/not_so_unique_string"); + msg->job_id_s = strdup("https://localhost:9000/not_so_unique_string"); } else #endif msg->job_id_s = edg_wll_GetJobId(event->data); -- 1.8.2.3