octoleo/gh-ost
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

graceful sleep; remove extra debug info

Browse Source
This commit is contained in:
Shlomi Noach 2019-08-11 15:21:04 +03:00
parent 1305ff6e01
commit 90ab2368dd
2 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
localtests/test.sh
View File

@ -50,21 +50,8 @@ verify_master_and_replica() {
original_sql_mode="$(gh-ost-test-mysql-master -e "select @@global.sql_mode" -s -s)" original_sql_mode="$(gh-ost-test-mysql-master -e "select @@global.sql_mode" -s -s)"
echo "sql_mode on master is ${original_sql_mode}" echo "sql_mode on master is ${original_sql_mode}"
gh-ost-test-mysql-replica -uroot -proot -e "select 1 as root" -ss echo "Gracefully sleeping for 3 seconds while replica is setting up..."
gh-ost-test-mysql-replica -e "select 1 as msandbox" -ss sleep 3
sleep 1
gh-ost-test-mysql-replica -uroot -proot -e "select 1 as root" -ss
gh-ost-test-mysql-replica -e "select 1 as msandbox" -ss
sleep 1
gh-ost-test-mysql-replica -uroot -proot -e "select 1 as root" -ss
gh-ost-test-mysql-replica -e "select 1 as msandbox" -ss
sleep 1
gh-ost-test-mysql-replica -uroot -proot -e "select 1 as root" -ss
gh-ost-test-mysql-replica -e "select 1 as msandbox" -ss
sleep 1
gh-ost-test-mysql-replica -uroot -proot -e "select 1 as root" -ss
gh-ost-test-mysql-replica -e "select 1 as msandbox" -ss
sleep 1
if [ "$(gh-ost-test-mysql-replica -e "select 1" -ss)" != "1" ] ; then if [ "$(gh-ost-test-mysql-replica -e "select 1" -ss)" != "1" ] ; then
echo "Cannot verify gh-ost-test-mysql-replica" echo "Cannot verify gh-ost-test-mysql-replica"

2
script/cibuild-gh-ost-replica-tests
View File

@ -44,11 +44,9 @@ test_mysql_version() {
sed '/sandboxes/d' -i gh-ost-ci-env/bin/gh-ost-test-mysql-master sed '/sandboxes/d' -i gh-ost-ci-env/bin/gh-ost-test-mysql-master
echo 'sandboxes/rsandbox/m "$@"' >> gh-ost-ci-env/bin/gh-ost-test-mysql-master echo 'sandboxes/rsandbox/m "$@"' >> gh-ost-ci-env/bin/gh-ost-test-mysql-master
cat gh-ost-ci-env/bin/gh-ost-test-mysql-master
sed '/sandboxes/d' -i gh-ost-ci-env/bin/gh-ost-test-mysql-replica sed '/sandboxes/d' -i gh-ost-ci-env/bin/gh-ost-test-mysql-replica
echo 'sandboxes/rsandbox/s1 "$@"' >> gh-ost-ci-env/bin/gh-ost-test-mysql-replica echo 'sandboxes/rsandbox/s1 "$@"' >> gh-ost-ci-env/bin/gh-ost-test-mysql-replica
cat gh-ost-ci-env/bin/gh-ost-test-mysql-replica
export PATH="${PWD}/gh-ost-ci-env/bin/:${PATH}" export PATH="${PWD}/gh-ost-ci-env/bin/:${PATH}"