Skip to content

Commit 90ab236

Browse files
author
Shlomi Noach
committed
graceful sleep; remove extra debug info
1 parent 1305ff6 commit 90ab236

File tree

2 files changed

+2
-17
lines changed

2 files changed

+2
-17
lines changed

localtests/test.sh

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -50,21 +50,8 @@ verify_master_and_replica() {
5050
original_sql_mode="$(gh-ost-test-mysql-master -e "select @@global.sql_mode" -s -s)"
5151
echo "sql_mode on master is ${original_sql_mode}"
5252

53-
gh-ost-test-mysql-replica -uroot -proot -e "select 1 as root" -ss
54-
gh-ost-test-mysql-replica -e "select 1 as msandbox" -ss
55-
sleep 1
56-
gh-ost-test-mysql-replica -uroot -proot -e "select 1 as root" -ss
57-
gh-ost-test-mysql-replica -e "select 1 as msandbox" -ss
58-
sleep 1
59-
gh-ost-test-mysql-replica -uroot -proot -e "select 1 as root" -ss
60-
gh-ost-test-mysql-replica -e "select 1 as msandbox" -ss
61-
sleep 1
62-
gh-ost-test-mysql-replica -uroot -proot -e "select 1 as root" -ss
63-
gh-ost-test-mysql-replica -e "select 1 as msandbox" -ss
64-
sleep 1
65-
gh-ost-test-mysql-replica -uroot -proot -e "select 1 as root" -ss
66-
gh-ost-test-mysql-replica -e "select 1 as msandbox" -ss
67-
sleep 1
53+
echo "Gracefully sleeping for 3 seconds while replica is setting up..."
54+
sleep 3
6855

6956
if [ "$(gh-ost-test-mysql-replica -e "select 1" -ss)" != "1" ] ; then
7057
echo "Cannot verify gh-ost-test-mysql-replica"

script/cibuild-gh-ost-replica-tests

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,9 @@ test_mysql_version() {
4444

4545
sed '/sandboxes/d' -i gh-ost-ci-env/bin/gh-ost-test-mysql-master
4646
echo 'sandboxes/rsandbox/m "$@"' >> gh-ost-ci-env/bin/gh-ost-test-mysql-master
47-
cat gh-ost-ci-env/bin/gh-ost-test-mysql-master
4847

4948
sed '/sandboxes/d' -i gh-ost-ci-env/bin/gh-ost-test-mysql-replica
5049
echo 'sandboxes/rsandbox/s1 "$@"' >> gh-ost-ci-env/bin/gh-ost-test-mysql-replica
51-
cat gh-ost-ci-env/bin/gh-ost-test-mysql-replica
5250

5351
export PATH="${PWD}/gh-ost-ci-env/bin/:${PATH}"
5452

0 commit comments

Comments
 (0)