diff --git a/tests/parallel_test/cases.task b/tests/parallel_test/cases.task index f07c712089f82dbb0eed2753b0164ab3074f6c00..ebaa732e104a2a00a8632e43629348435bd3e0d9 100644 --- a/tests/parallel_test/cases.task +++ b/tests/parallel_test/cases.task @@ -1,7 +1,6 @@ -# 806,,pytest,test.py -f update/append_commit_data.py too long time +113,,pytest,python3 test.py -f update/append_commit_data.py # 20,,pytest,insert/retentionpolicy.py change date time -# ,2,pytest,python3 ./test.py -f query/nestedQuery/nestedQuery_datacheck.py -# ,,pytest,python3 test.py -f tools/taosdemoTestTblAlt.py never quit +,2,pytest,python3 ./test.py -f query/nestedQuery/nestedQuery_datacheck.py 305,,pytest,python3 ./test.py -f update/merge_commit_data-0.py 301,,pytest,python3 ./test.py -f update/merge_commit_data.py 258,,script,./test.sh -f general/stream/stream_3.sim @@ -27,7 +26,7 @@ 110,,script,./test.sh -f unique/vnode/many.sim 110,,script,./test.sh -f general/parser/limit2.sim 101,,script,./test.sh -f general/db/alter_tables_d2.sim -# 99,,pytest,python3 ./test.py -f query/nestedQuery/nestedQuery.py +99,,pytest,python3 ./test.py -f query/nestedQuery/nestedQuery.py 95,,script,./test.sh -f unique/vnode/replica2_repeat.sim 91,,script,./test.sh -f unique/cluster/vgroup100.sim 89,,pytest,python3 ./test.py -f functions/function_interp.py @@ -152,22 +151,23 @@ 32,,script,./test.sh -f unique/mnode/mgmt30.sim 32,,script,./test.sh -f unique/mnode/mgmt21.sim 32,,script,./test.sh -f unique/arbitrator/offline_replica2_createTable_online.sim -# 32,,pytest,python3 test.py -f tools/taosdemoAllTest/taosdemoTestQueryWithJson.py +32,,pytest,python3 test.py -f tools/taosdemoAllTest/taosdemoTestQueryWithJson.py 31,,script,./test.sh -f unique/dnode/monitor_bug.sim 31,,script,./test.sh -f unique/arbitrator/sync_replica3_dropDb.sim 31,,script,./test.sh -f unique/arbitrator/offline_replica3_alterTable_online.sim 31,,script,./test.sh -f general/parser/tbnameIn.sim 31,,script,./test.sh -f general/db/delete_writing2.sim -# 31,,pytest,python3 test.py -f tools/taosdemoTestLimitOffset.py +31,,pytest,python3 test.py -f tools/taosdemoTestLimitOffset.py 30,,script,./test.sh -f unique/dnode/alternativeRole.sim 30,,script,./test.sh -f unique/arbitrator/offline_replica2_alterTag_online.sim 30,,script,./test.sh -f issue/TD-2677.sim 30,,script,./test.sh -f general/db/topic1.sim -# 30,,pytest,python3 ./test.py -f wal/sdbComp.py +30,,pytest,python3 ./test.py -f wal/sdbComp.py 29,,script,./test.sh -f unique/column/replica3.sim 29,,script,./test.sh -f unique/arbitrator/sync_replica2_alterTable_drop.sim 29,,script,./test.sh -f general/table/delete_writing.sim 29,,script,./test.sh -f general/compress/compress.sim +29,,pytest,python3 test.py -f tools/taosdemoTestTblAlt.py 28,,script,./test.sh -f unique/stable/dnode2_stop.sim 28,,script,./test.sh -f unique/migrate/mn2_vn2_repl2_rmMnodeVnodeDir_stopAll_starAll.sim 28,,script,./test.sh -f unique/arbitrator/offline_replica2_dropDb_online.sim @@ -194,7 +194,7 @@ 25,,script,./test.sh -f general/cache/restart_metrics.sim 25,,script,./test.sh -f general/alter/cached_schema_after_alter.sim 25,,pytest,python3 ./test.py -f queryCount.py -# 25,,pytest,python3 test.py -f alter/alter_cacheLastRow.py +25,,pytest,python3 test.py -f alter/alter_cacheLastRow.py 24,,script,./test.sh -f unique/arbitrator/offline_replica3_alterTag_online.sim 24,,script,./test.sh -f issue/TD-2680.sim 24,,script,./test.sh -f general/parser/select_with_tags.sim @@ -240,8 +240,8 @@ 21,,script,./test.sh -f general/parser/set_tag_vals.sim 21,,script,./test.sh -f general/http/grafana_bug.sim 21,,script,./test.sh -f general/cache/restart_table.sim -# 21,,pytest,python3 test.py -f tools/taosdemoTestInterlace.py -# 21,,pytest,python3 test.py -f tools/taosdemoAllTest/NanoTestCase/taosdemoTestSupportNanoInsert.py +21,,pytest,python3 test.py -f tools/taosdemoTestInterlace.py +21,,pytest,python3 test.py -f tools/taosdemoAllTest/NanoTestCase/taosdemoTestSupportNanoInsert.py 21,,pytest,python3 ./test.py -f import_merge/importDataLastSub.py 21,,pytest,python3 ./test.py -f import_merge/importCacheFileTO.py 21,,pytest,python3 ./test.py -f import_merge/importCacheFileH.py @@ -260,13 +260,13 @@ 19,,script,./test.sh -f general/http/restful.sim 19,,script,./test.sh -f general/http/restful_full.sim 19,,script,./test.sh -f general/db/repeat.sim -# 19,,pytest,python3 test.py -f tools/taosdemoTestSampleData.py -# 19,,pytest,python3 test.py -f tools/taosdemoTest.py -# 19,,pytest,python3 test.py -f tools/taosdemoAllTest/taosdemoTestInsertWithJsonStmt.py -# 19,,pytest,python3 test.py -f tools/taosdemoAllTest/NanoTestCase/taosdemoTestSupportNanoQuery.py -# 19,,pytest,python3 test.py -f tools/taosdemoAllTest/NanoTestCase/taosdemoTestInsertTime_step.py -# 19,,pytest,python3 ./test.py -f query/query1970YearsAf.py -# 19,,pytest,python3 ./test.py -f perfbenchmark/bug3433.py +19,,pytest,python3 test.py -f tools/taosdemoTestSampleData.py +19,,pytest,python3 test.py -f tools/taosdemoTest.py +19,,pytest,python3 test.py -f tools/taosdemoAllTest/taosdemoTestInsertWithJsonStmt.py +19,,pytest,python3 test.py -f tools/taosdemoAllTest/NanoTestCase/taosdemoTestSupportNanoQuery.py +19,,pytest,python3 test.py -f tools/taosdemoAllTest/NanoTestCase/taosdemoTestInsertTime_step.py +19,,pytest,python3 ./test.py -f query/query1970YearsAf.py +19,,pytest,python3 ./test.py -f perfbenchmark/bug3433.py 19,,pytest,python3 ./test.py -f import_merge/importDataLastH.py 19,,pytest,python3 ./test.py -f client/taoshellCheckCase.py 18,,script,./test.sh -f unique/stable/dnode2.sim @@ -276,17 +276,17 @@ 18,,script,./test.sh -f general/parser/auto_create_tb.sim 18,,script,./test.sh -f general/http/gzip.sim 18,2,script,./test.sh -f general/alter/dnode.sim -# 18,,pytest,python3 test.py -f tools/taosdemoTestWithJson.py -# 18,,pytest,python3 test.py -f tools/taosdemoAllTest/TD-4985/query-limit-offset.py -# 18,,pytest,python3 test.py -f tools/taosdemoAllTest/taosdemoTestInsertWithJson.py +18,,pytest,python3 test.py -f tools/taosdemoTestWithJson.py +18,,pytest,python3 test.py -f tools/taosdemoAllTest/TD-4985/query-limit-offset.py +18,,pytest,python3 test.py -f tools/taosdemoAllTest/taosdemoTestInsertWithJson.py 18,,pytest,python3 ./test.py -f import_merge/importTORestart.py 17,,script,./test.sh -f general/user/monitor.sim 17,,script,./test.sh -f general/parser/single_row_in_tb.sim 17,,script,./test.sh -f general/parser/auto_create_tb_drop_tb.sim 17,,script,./test.sh -f general/insert/tcp.sim 17,,script,./test.sh -f general/db/tables.sim -# 17,,pytest,python3 test.py -f tools/taosdemoTestWithoutMetric.py -# 17,,pytest,python3 test.py -f tools/taosdemoAllTest/TD-5213/insertSigcolumnsNum4096.py +17,,pytest,python3 test.py -f tools/taosdemoTestWithoutMetric.py +17,,pytest,python3 test.py -f tools/taosdemoAllTest/TD-5213/insertSigcolumnsNum4096.py 17,,pytest,python3 ./test.py -f stream/history.py 17,,pytest,python3 ./test.py -f import_merge/importTRestart.py 17,,pytest,python3 ./test.py -f import_merge/importTPORestart.py @@ -462,8 +462,8 @@ 11,,script,./test.sh -f general/compute/diff.sim 11,,script,./test.sh -f general/compute/count.sim 11,,script,./test.sh -f general/alter/import.sim -# 11,,pytest,python3 test.py -f tools/taosdemoAllTest/NanoTestCase/taosdemoTestSupportNanosubscribe.py -# 11,,pytest,python3 test.py -f subscribe/supertable.py +11,,pytest,python3 test.py -f tools/taosdemoAllTest/NanoTestCase/taosdemoTestSupportNanosubscribe.py +11,,pytest,python3 test.py -f subscribe/supertable.py 11,,pytest,python3 ./test.py -f functions/function_percentile2.py 10,,script,./test.sh -f unique/account/paras.sim 10,,script,./test.sh -f general/table/smallint.sim @@ -505,7 +505,7 @@ 9,,pytest,python3 ./test.py -f insert/insertFromCSV.py 9,,pytest,python3 test.py -f dbmgmt/nanoSecondCheck.py 8,,script,./test.sh -f unique/stable/replica2_vnode3.sim -# 8,,script,./test.sh -f general/parser/columnValue.sim +8,,script,./test.sh -f general/parser/columnValue.sim 8,,pytest,python3 test.py -f tools/taosdumpTest2.py 8,,pytest,python3 ./test.py -f tag_lite/tinyint.py 8,,pytest,python3 ./test.py -f tag_lite/TestModifyTag.py @@ -630,7 +630,7 @@ 4,,pytest,python3 ./test.py -f tag_lite/unsignedBigint.py 4,,pytest,python3 ./test.py -f tag_lite/drop_auto_create.py 4,,pytest,python3 ./test.py -f tag_lite/alter_tag.py -# 4,,pytest,python3 test.py -f subscribe/singlemeter.py +4,,pytest,python3 test.py -f subscribe/singlemeter.py 4,,pytest,python3 ./test.py -f query/ts_2016.py 4,,pytest,python3 ./test.py -f query/subqueryFilter.py 4,,pytest,python3 ./test.py -f query/queryWildcardLength.py diff --git a/tests/parallel_test/run.sh b/tests/parallel_test/run.sh index 582615f62d84eea218dd3bab27421f380d211865..026bfb020d9a77d5cd1b05e9030cfce69a7ba4c7 100755 --- a/tests/parallel_test/run.sh +++ b/tests/parallel_test/run.sh @@ -140,7 +140,7 @@ function build_src() { flock -x $lock_file -c "echo \"${hosts[index]} taos-tools build failed\" >>$log_dir/failed.log" return fi - script="cp -rf ${workdirs[index]}/taos-tools/build/build/bin/* ${workdirs[index]}/TDinternal/debug/build/bin/;cp -rf ${workdirs[index]}/taos-tools/build/build/lib/* ${workdirs[index]}/TDinternal/debug/build/lib/;cp -rf ${workdirs[index]}/taos-tools/build/build/lib64/* ${workdirs[index]}/TDinternal/debug/build/lib/;cp -rf ${workdirs[index]}/TDinternal/debug/build/bin/demo ${workdirs[index]}/TDinternal/debug/build/bin/taosdemo" + script="cp -rf ${workdirs[index]}/taos-tools/build/build/bin/* ${workdirs[index]}/TDinternal/debug/build/bin/;cp -rf ${workdirs[index]}/taos-tools/build/build/lib/* ${workdirs[index]}/TDinternal/debug/build/lib/;cp -rf ${workdirs[index]}/taos-tools/build/build/lib64/* ${workdirs[index]}/TDinternal/debug/build/lib/;cp -rf ${workdirs[index]}/TDinternal/debug/build/bin/taosBenchmark ${workdirs[index]}/TDinternal/debug/build/bin/taosdemo" cmd="${ssh_script} sh -c \"$script\"" ${cmd} } @@ -150,7 +150,7 @@ function rename_taosdemo() { if [ -z ${passwords[index]} ]; then ssh_script="ssh -o StrictHostKeyChecking=no ${usernames[index]}@${hosts[index]}" fi - local script="cp -rf ${workdirs[index]}/TDinternal/debug/build/bin/demo ${workdirs[index]}/TDinternal/debug/build/bin/taosdemo" + local script="cp -rf ${workdirs[index]}/TDinternal/debug/build/bin/taosBenchmark ${workdirs[index]}/TDinternal/debug/build/bin/taosdemo 2>/dev/null" cmd="${ssh_script} sh -c \"$script\"" ${cmd} } @@ -182,7 +182,7 @@ function run_thread() { fi local case_redo_time=`echo "$line"|cut -d, -f2` if [ -z "$case_redo_time" ]; then - case_redo_time=1 + case_redo_time=${DEFAULT_RETRY_TIME:-2} fi local exec_dir=`echo "$line"|cut -d, -f3` local case_cmd=`echo "$line"|cut -d, -f4` @@ -232,6 +232,10 @@ function run_thread() { if [ $? -eq 0 ]; then redo=1 fi + grep -q "ssh_exchange_identification: Connection closed by remote host" $log_dir/$case_file.log + if [ $? -eq 0 ]; then + redo=1 + fi grep -q "kex_exchange_identification: read: Connection reset by peer" $log_dir/$case_file.log if [ $? -eq 0 ]; then redo=1 @@ -273,7 +277,7 @@ function run_thread() { cat $log_dir/$case_file.log echo "=====================================================" echo -e "\e[34m log file: $log_dir/$case_file.log \e[0m" - if [ ! -z $corefile ]; then + if [ ! -z "$corefile" ]; then echo -e "\e[34m corefiles: $corefile \e[0m" fi fi diff --git a/tests/parallel_test/run_case.sh b/tests/parallel_test/run_case.sh index 5884f400b50701bedb70a314e346a9ed93a6b2b3..5b7802ac2b346547e4d2cd171e93c1d5937a5360 100755 --- a/tests/parallel_test/run_case.sh +++ b/tests/parallel_test/run_case.sh @@ -43,11 +43,17 @@ fi go env -w GOPROXY=https://goproxy.cn echo "StrictHostKeyChecking no" >>/etc/ssh/ssh_config -ln -s $CONTAINER_TESTDIR/debug/build/lib/libtaos.so /usr/lib/libtaos.so +ln -s /home/debug/build/lib/libtaos.so /usr/lib/libtaos.so 2>/dev/null npm config -g set unsafe-perm npm config -g set registry https://registry.npm.taobao.org mkdir -p /home/sim/tsim - +mkdir -p /var/lib/taos/subscribe +rm -rf ${CONTAINER_TESTDIR}/src/connector/nodejs/node_modules +rm -rf ${CONTAINER_TESTDIR}/tests/examples/nodejs/node_modules +rm -rf ${CONTAINER_TESTDIR}/tests/connectorTest/nodejsTest/nanosupport/node_modules +# ln -s /home/node_modules ${CONTAINER_TESTDIR}/src/connector/nodejs/ +# ln -s /home/node_modules ${CONTAINER_TESTDIR}/tests/examples/nodejs/ +# ln -s /home/node_modules ${CONTAINER_TESTDIR}/tests/connectorTest/nodejsTest/nanosupport/ # echo "$cmd"|grep -q "nodejs" # if [ $? -eq 0 ]; then # cd $CONTAINER_TESTDIR/src/connector/nodejs diff --git a/tests/parallel_test/run_container.sh b/tests/parallel_test/run_container.sh index 35e214d4ab4696a54be8bfb47216f13071bd803d..e0a2fc4dc8679356122afc6679e6748ab2f8f9e6 100755 --- a/tests/parallel_test/run_container.sh +++ b/tests/parallel_test/run_container.sh @@ -77,24 +77,29 @@ if [ $? -eq 0 ]; then -v $TMP_DIR/thread_volume/$thread_no/node_modules:${CONTAINER_TESTDIR}/tests/examples/nodejs/node_modules \ -v $TMP_DIR/thread_volume/$thread_no/node_modules:${CONTAINER_TESTDIR}/tests/connectorTest/nodejsTest/nanosupport/node_modules" fi +if [ -f "$REPDIR/src/plugins/taosadapter/example/config/taosadapter.toml" ]; then + TAOSADAPTER_TOML="-v $REPDIR/src/plugins/taosadapter/example/config/taosadapter.toml:/etc/taos/taosadapter.toml:ro" +fi docker run \ -v $REPDIR/tests:$CONTAINER_TESTDIR/tests \ -v $MOUNT_DIR \ -v "$TMP_DIR/thread_volume/$thread_no/sim:${CONTAINER_TESTDIR}/sim" \ -v ${TMP_DIR}/thread_volume/$thread_no/coredump:/home/coredump \ - -v $INTERNAL_REPDIR/debug:$CONTAINER_TESTDIR/debug:ro \ + -v $INTERNAL_REPDIR/debug:/home/debug:ro \ -v $REPDIR/deps:$CONTAINER_TESTDIR/deps:ro \ -v $REPDIR/src:$CONTAINER_TESTDIR/src \ -v $REPDIR/src/inc/taos.h:/usr/include/taos.h:ro \ + $TAOSADAPTER_TOML \ -v $REPDIR/tests/examples:$CONTAINER_TESTDIR/tests/examples \ -v $REPDIR/snap:$CONTAINER_TESTDIR/snap:ro \ -v $REPDIR/alert:$CONTAINER_TESTDIR/alert:ro \ -v $REPDIR/packaging/cfg/taos.cfg:/etc/taos/taos.cfg:ro \ + -v $REPDIR/packaging:$CONTAINER_TESTDIR/packaging:ro \ -v $REPDIR/README.md:$CONTAINER_TESTDIR/README.md:ro \ -v $REPDIR/src/connector/python/taos:/usr/local/lib/python3.8/site-packages/taos:ro \ - -e LD_LIBRARY_PATH=$CONTAINER_TESTDIR/debug/build/lib:$CONTAINER_TESTDIR/debug/build/lib64 \ - -e PATH=/usr/local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$CONTAINER_TESTDIR/debug/build/bin:/usr/local/go/bin:/usr/local/node-v12.20.0-linux-x64/bin:/usr/local/apache-maven-3.8.4/bin:/usr/local/jdk1.8.0_144/bin \ + -e LD_LIBRARY_PATH=/home/debug/build/lib:/home/debug/build/lib64 \ + -e PATH=/usr/local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/home/debug/build/bin:/usr/local/go/bin:/usr/local/node-v12.20.0-linux-x64/bin:/usr/local/apache-maven-3.8.4/bin:/usr/local/jdk1.8.0_144/bin \ -e JAVA_HOME=/usr/local/jdk1.8.0_144 \ --rm --ulimit core=-1 taos_test:v1.0 $CONTAINER_TESTDIR/tests/parallel_test/run_case.sh -d "$exec_dir" -c "$cmd" ret=$?