diff --git a/tests/script/jenkins/basic.txt b/tests/script/jenkins/basic.txt index cbcc2d86efa4706da16706c1d9eec490eb3d02f2..56b1bb8c159ac377b3dcbfef6c2ee51d35c68475 100644 --- a/tests/script/jenkins/basic.txt +++ b/tests/script/jenkins/basic.txt @@ -167,7 +167,7 @@ ./test.sh -f tsim/sma/rsmaPersistenceRecovery.sim # --- valgrind -./test.sh -f tsim/valgrind/checkError.sim -v +./test.sh -f tsim/valgrind/checkError.sim # --- vnode # ./test.sh -f tsim/vnode/replica3_basic.sim diff --git a/tests/script/sh/checkValgrind.sh b/tests/script/sh/checkValgrind.sh index e3afb10752bf1fb4c1e5db267b35cb1070630c62..56358f5954aa88bfabf64b3c6bd954c54687998f 100755 --- a/tests/script/sh/checkValgrind.sh +++ b/tests/script/sh/checkValgrind.sh @@ -35,5 +35,10 @@ LOG_DIR=$TAOS_DIR/sim/$NODE_NAME/log #echo ---- $LOG_DIR #errors=`grep "ERROR SUMMARY:" ${LOG_DIR}/valgrind-taosd-*.log | cut -d ' ' -f 2,3,4,5 | tr -d "\n"` -errors=`cat ${LOG_DIR}/valgrind-taosd-*.log | grep "ERROR SUMMARY:" | awk '{print $4}' | awk '{sum+=$1}END{print sum}'` + +error_summary=`cat ${LOG_DIR}/valgrind-taosd-*.log | grep "ERROR SUMMARY:" | awk '{print $4}' | awk '{sum+=$1}END{print sum}'` +still_reachable=`cat ${LOG_DIR}/valgrind-taosd-*.log | grep "still reachable in" | wc -l` +definitely_lost=`cat ${LOG_DIR}/valgrind-taosd-*.log | grep "definitely lost in" | wc -l` + +let "errors=$still_reachable+$error_summary+$definitely_lost" echo $errors diff --git a/tests/script/tsim/valgrind/checkError.sim b/tests/script/tsim/valgrind/checkError.sim index 8798f80cd0bae203b0c910709cbc682695c342fa..573c9821ed19e9a967041c85ecade33e8ca0f0b0 100644 --- a/tests/script/tsim/valgrind/checkError.sim +++ b/tests/script/tsim/valgrind/checkError.sim @@ -1,88 +1,39 @@ system sh/stop_dnodes.sh system sh/deploy.sh -n dnode1 -i 1 -#system sh/deploy.sh -n dnode2 -i 2 -#system sh/deploy.sh -n dnode3 -i 3 -#system sh/deploy.sh -n dnode4 -i 4 -#system sh/cfg.sh -n dnode1 -c supportVnodes -v 0 -system sh/exec.sh -n dnode1 -s start -#system sh/exec.sh -n dnode2 -s start -#system sh/exec.sh -n dnode3 -s start -#system sh/exec.sh -n dnode4 -s start - -sleep 2000 - -#$loop_cnt = 0 -#check_dnode_ready: -# $loop_cnt = $loop_cnt + 1 -# sleep 200 -# if $loop_cnt == 10 then -# print ====> dnode not ready! -# return -1 -# endi -#sql show dnodes -#print ===> $rows $data[0][0] $data[0][1] $data[0][2] $data[0][3] $data[0][4] $data[0][5] $data[0][6] -#print ===> $rows $data[1][0] $data[1][1] $data[1][2] $data[1][3] $data[1][4] $data[1][5] $data[1][6] -#print ===> $rows $data[2][0] $data[2][1] $data[2][2] $data[2][3] $data[2][4] $data[2][5] $data[2][6] -#print ===> $rows $data[3][0] $data[3][1] $data[3][2] $data[3][3] $data[3][4] $data[3][5] $data[3][6] -#if $data[0][0] != 1 then -# return -1 -#endi -#if $data[0][4] != ready then -# goto check_dnode_ready -#endi -# -##sql connect -#sql create dnode $hostname port 7200 -#sql create dnode $hostname port 7300 -#sql create dnode $hostname port 7400 -# -#$loop_cnt = 0 -#check_dnode_ready_1: -#$loop_cnt = $loop_cnt + 1 -#sleep 200 -#if $loop_cnt == 10 then -# print ====> dnodes not ready! -# return -1 -#endi -#sql show dnodes -#print ===> $rows $data[0][0] $data[0][1] $data[0][2] $data[0][3] $data[0][4] $data[0][5] $data[0][6] -#print ===> $rows $data[1][0] $data[1][1] $data[1][2] $data[1][3] $data[1][4] $data[1][5] $data[1][6] -#print ===> $rows $data[2][0] $data[2][1] $data[2][2] $data[2][3] $data[2][4] $data[2][5] $data[2][6] -#print ===> $rows $data[3][0] $data[3][1] $data[3][2] $data[3][3] $data[3][4] $data[3][5] $data[3][6] -#if $data[0][4] != ready then -# goto check_dnode_ready_1 -#endi -#if $data[1][4] != ready then -# goto check_dnode_ready_1 -#endi -#if $data[2][4] != ready then -# goto check_dnode_ready_1 -#endi -#if $data[3][4] != ready then -# goto check_dnode_ready_1 -#endi - -#=========== please add any actions above ================= - -print ====> stop all dondes to output valgrind log file +system sh/exec.sh -n dnode1 -s start -v +sql connect + +print =============== step1 + +$x = 0 +step1: + $x = $x + 1 + sleep 1000 + if $x == 10 then + print ----> dnode not ready! + return -1 + endi +sql show dnodes +print ----> $data00 $data01 $data02 $data03 $data04 $data05 +if $rows != 1 then + return -1 +endi + +print =============== step2 + +print =============== stop system sh/exec.sh -n dnode1 -s stop -x SIGINT -print ====> start to check if there are ERRORS in vagrind log file for each dnode +print ----> start to check if there are ERRORS in vagrind log file for each dnode # -n : dnode[x] be check system_content sh/checkValgrind.sh -n dnode1 -print cmd return result----> [ $system_content ] + # temporarily expand the threshold, since no time to fix the memory leaks. +print cmd return result ----> [ $system_content ] if $system_content <= 5 then return 0 endi -# This error occurs frequently, allowing it -# ==435850== 46 bytes in 1 blocks are definitely lost in loss record 1 of 3 -# ==435850== at 0x483DD99: calloc (in /usr/lib/x86_64-linux-gnu/valgrind/vgp reload_memcheck-amd64-linux.so) -# ==435850== by 0x414AE0: taosMemoryCalloc (osMemory.c:212) -# ==435850== by 0x352730: transAllocBuffer (transComm.c:123) -# ==435850== by 0x34F42A: cliAllocRecvBufferCb (transCli.c:485) - $null= if $system_content == $null then return 0