diff --git a/Jenkinsfile b/Jenkinsfile
index daae5a5ad09f24a980bdcea5f5551b53a24c02aa..bd7d5d700a65e996cfd441daeea678487f55598d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -185,6 +185,12 @@ pipeline {
             rm -rf /var/log/taos/*
             ./handle_crash_gen_val_log.sh
             '''
+            sh '''
+            cd ${WKC}/tests/pytest
+            rm -rf /var/lib/taos/*
+            rm -rf /var/log/taos/*
+            ./handle_taosd_val_log.sh
+            '''
             timeout(time: 45, unit: 'MINUTES'){
                 sh '''
                 date
diff --git a/tests/Jenkinsfile b/tests/Jenkinsfile
index 6db6351442a5b67b4088216dc27990097f56618a..b7b36eae0706f4081b0b8551536b4b5eae2eec97 100644
--- a/tests/Jenkinsfile
+++ b/tests/Jenkinsfile
@@ -76,9 +76,20 @@ pipeline {
             catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
                 sh '''
                 cd ${WKC}/tests/pytest
+                rm -rf /var/lib/taos/*
+                rm -rf /var/log/taos/*
                 ./handle_crash_gen_val_log.sh
                 '''
             }
+            catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
+                sh '''
+                cd ${WKC}/tests/pytest
+                rm -rf /var/lib/taos/*
+                rm -rf /var/log/taos/*
+                ./handle_taosd_val_log.sh
+                '''
+            }
+            
             sh'''
             systemctl start taosd 
             sleep 10
diff --git a/tests/pytest/handle_taosd_val_log.sh b/tests/pytest/handle_taosd_val_log.sh
new file mode 100755
index 0000000000000000000000000000000000000000..221dfc649f13587a3b5e00fd170cef39d48bb63d
--- /dev/null
+++ b/tests/pytest/handle_taosd_val_log.sh
@@ -0,0 +1,69 @@
+#!/bin/bash
+# Color setting
+RED='\033[0;31m'
+GREEN='\033[1;32m'
+GREEN_DARK='\033[0;32m'
+GREEN_UNDERLINE='\033[4;32m'
+NC='\033[0m'
+IN_TDINTERNAL="community"
+TDIR=`pwd`
+if [[ "$tests_dir" == *"$IN_TDINTERNAL"* ]]; then
+  cd ../..
+else
+  cd ../../..
+fi
+TOP_DIR=`pwd`
+TAOSD_DIR=`find . -name "taosd"|grep -v community|grep debug|head -n1`
+VALGRIND_OUT=taosd_valgrind.out 
+VALGRIND_ERR=taosd_valgrind.err
+rm -rf /var/lib/taos/*
+# nohup valgrind  --tool=memcheck --leak-check=yes $TAOSD_DIR > $TDIR/$VALGRIND_OUT 2> $TDIR/$VALGRIND_ERR  &
+nohup valgrind  --leak-check=yes $TAOSD_DIR > $TDIR/$VALGRIND_OUT 2> $TDIR/$VALGRIND_ERR  &
+sleep 5
+cd -
+./crash_gen.sh  -p -t 3 -s 200 
+ps -ef |grep valgrind|grep -v grep|awk '{print $2}'|xargs kill -term
+while true 
+do
+	monitoring=` ps -ef|grep valgrind |grep -v grep| wc -l`
+	if [ $monitoring -eq 0 ] 
+	then
+		echo "Manipulator is not running "
+    break
+	else
+		sleep 1
+	fi
+done
+
+grep 'start to execute\|ERROR SUMMARY' $VALGRIND_ERR | grep -v 'grep' | uniq | tee taosd_mem_err.log
+
+for memError in `grep 'ERROR SUMMARY' taosd_mem_err.log | awk '{print $4}'`
+do
+memError=(${memError//,/})
+echo $memError
+if [ -n "$memError" ]; then
+    if [ "$memError" -gt 12 ]; then
+    echo -e "${RED} ## Memory errors number valgrind reports is $memError.\
+                More than our threshold! ## ${NC}"
+    fi
+fi
+done
+
+grep 'start to execute\|definitely lost:' $VALGRIND_ERR|grep -v 'grep'|uniq|tee taosd-definitely-lost-out.log
+for defiMemError in `grep 'definitely lost:' taosd-definitely-lost-out.log | awk '{print $7}'`
+do
+defiMemError=(${defiMemError//,/})
+if [ -n "$defiMemError" ]; then
+    if [ "$defiMemError" -gt 0 -a "$defiMemError" -lt 1013 ]; then
+      cat $VALGRIND_ERR
+      echo -e "${RED} ## Memory errors number valgrind reports \
+                  Definitely lost is $defiMemError. More than our threshold! ## ${NC}"
+      exit 8
+    elif [ "$defiMemError" -gt 1013 ];then           #add for azure
+      cat $VALGRIND_ERR
+      echo -e "${RED} ## Memory errors number valgrind reports \
+                Definitely lost is $defiMemError. More than our threshold! ## ${NC}"
+      exit 8
+    fi
+fi
+done