Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix tidb_ghpr_tics_test fail #1895

Merged
merged 1 commit into from
May 12, 2021
Merged

Fix tidb_ghpr_tics_test fail #1895

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 2 additions & 50 deletions tests/docker/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ function wait_env() {

for (( i = 0; i < "${timeout}"; i++ )); do
if [[ -n $(cat ./log/tidb0/tidb.log | grep "server is running MySQL protocol") && \
-n $(cat ./log/tiflash_${engine}/server.log | grep "Ready for connections") ]]; then
-n $(cat ./log/tiflash/server.log | grep "Ready for connections") ]]; then
local failed='false'
break
fi
Expand Down Expand Up @@ -69,13 +69,6 @@ docker-compose \

rm -rf ./data ./log

# run async-commit tests under tidb with failpoint
docker-compose -f cluster_tidb_fail_point.yaml -f tiflash-dt.yaml up -d
wait_env dt
docker-compose -f cluster_tidb_fail_point.yaml -f tiflash-dt.yaml exec -T tiflash0 bash -c 'cd /tests ; ./run-test.sh async-commit'
docker-compose -f cluster_tidb_fail_point.yaml -f tiflash-dt.yaml down
rm -rf ./data ./log

#################################### TIDB-CI ONLY ####################################
# run fullstack-tests (for engine DeltaTree)
docker-compose -f cluster.yaml -f tiflash-dt.yaml up -d
Expand All @@ -85,45 +78,4 @@ docker-compose -f cluster.yaml -f tiflash-dt.yaml down
rm -rf ./data ./log

[[ "$TIDB_CI_ONLY" -eq 1 ]] && exit
#################################### TIDB-CI ONLY ####################################


# run gtest cases. (only tics-gtest up)
docker-compose -f gtest.yaml up -d
docker-compose -f gtest.yaml exec -T tics-gtest bash -c 'cd /tests && ./run-gtest.sh'
docker-compose -f gtest.yaml down
rm -rf ./data ./log


# run fullstack-tests (for engine DeltaTree)
docker-compose -f cluster.yaml -f tiflash-dt.yaml up -d
wait_env dt
docker-compose -f cluster.yaml -f tiflash-dt.yaml exec -T tiflash0 bash -c 'cd /tests ; ./run-test.sh fullstack-test true && ./run-test.sh fullstack-test-dt'
docker-compose -f cluster.yaml -f tiflash-dt.yaml down
rm -rf ./data ./log


# We need to separate mock-test for dt and tmt, since this behavior
# is different in some tests
# * "tmt" engine ONLY support disable_bg_flush = false.
# * "dt" engine ONLY support disable_bg_flush = true.
# (only tics0 up) (for engine DetlaTree)
docker-compose -f mock-test-dt.yaml up -d
docker-compose -f mock-test-dt.yaml exec -T tics0 bash -c 'cd /tests ; ./run-test.sh delta-merge-test'
docker-compose -f mock-test-dt.yaml down
rm -rf ./data ./log


# (only tics0 up) (for engine TxnMergeTree)
docker-compose -f mock-test-tmt.yaml up -d
docker-compose -f mock-test-tmt.yaml exec -T tics0 bash -c 'cd /tests ; ./run-test.sh mutable-test'
docker-compose -f mock-test-tmt.yaml down
rm -rf ./data ./log


# run new_collation_fullstack tests
docker-compose -f cluster_new_collation.yaml -f tiflash-dt.yaml up -d
wait_env dt
docker-compose -f cluster_new_collation.yaml -f tiflash-dt.yaml exec -T tiflash0 bash -c 'cd /tests ; ./run-test.sh new_collation_fullstack'
docker-compose -f cluster_new_collation.yaml -f tiflash-dt.yaml down
rm -rf ./data ./log
#################################### TIDB-CI ONLY ####################################
0 .../tidb-ci/fullstack-test/resolve-lock.test → ...idb-ci/fail-point-tests/resolve-lock.test
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion tests/tidb-ci/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ clean_data_log

docker-compose -f cluster.yaml -f tiflash-dt.yaml up -d
wait_env
docker-compose -f cluster.yaml -f tiflash-dt.yaml exec -T tiflash0 bash -c 'cd /tests ; ./run-test.sh tidb-ci/fullstack-test true && ./run-test.sh tidb-ci/fullstack-test-dt'
docker-compose -f cluster.yaml -f tiflash-dt.yaml exec -T tiflash0 bash -c 'cd /tests ; ./run-test.sh tidb-ci/fail-point-tests && ./run-test.sh tidb-ci/fullstack-test true && ./run-test.sh tidb-ci/fullstack-test-dt'

docker-compose -f cluster.yaml -f tiflash-dt.yaml down
clean_data_log
Expand Down