Skip to content

Commit fbf03a9

Browse files
committed
Fix behavior during initialization timeout
1 parent 6b1dc54 commit fbf03a9

File tree

4 files changed

+13
-9
lines changed

4 files changed

+13
-9
lines changed

5.5/docker-entrypoint.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,15 +97,16 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
9797

9898
mysql=( mysql --protocol=socket -uroot -hlocalhost --socket="${SOCKET}" )
9999

100-
for i in {30..0}; do
100+
for i in {${MYSQL_START_TIMEOUT:-30}..0}; do
101101
if echo 'SELECT 1' | "${mysql[@]}" &> /dev/null; then
102102
break
103103
fi
104104
echo 'MySQL init process in progress...'
105105
sleep 1
106106
done
107107
if [ "$i" = 0 ]; then
108-
echo >&2 'MySQL init process failed.'
108+
echo >&2 'MySQL init process failed. Cleaning up..'
109+
rm -rf $DATADIR/mysql
109110
exit 1
110111
fi
111112

5.6/docker-entrypoint.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,15 +97,16 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
9797

9898
mysql=( mysql --protocol=socket -uroot -hlocalhost --socket="${SOCKET}" )
9999

100-
for i in {30..0}; do
100+
for i in $(seq ${MYSQL_START_TIMEOUT:-30} -1 0); do
101101
if echo 'SELECT 1' | "${mysql[@]}" &> /dev/null; then
102102
break
103103
fi
104-
echo 'MySQL init process in progress...'
104+
echo "MySQL init process in progress..."
105105
sleep 1
106106
done
107107
if [ "$i" = 0 ]; then
108-
echo >&2 'MySQL init process failed.'
108+
echo >&2 'MySQL init process failed. Cleaning up..'
109+
rm -rf $DATADIR/mysql
109110
exit 1
110111
fi
111112

5.7/docker-entrypoint.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,15 +104,16 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
104104

105105
mysql=( mysql --protocol=socket -uroot -hlocalhost --socket="${SOCKET}" )
106106

107-
for i in {30..0}; do
107+
for i in {${MYSQL_START_TIMEOUT:-30}..0}; do
108108
if echo 'SELECT 1' | "${mysql[@]}" &> /dev/null; then
109109
break
110110
fi
111111
echo 'MySQL init process in progress...'
112112
sleep 1
113113
done
114114
if [ "$i" = 0 ]; then
115-
echo >&2 'MySQL init process failed.'
115+
echo >&2 'MySQL init process failed. Cleaning up..'
116+
rm -rf $DATADIR/mysql
116117
exit 1
117118
fi
118119

8.0/docker-entrypoint.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,15 +104,16 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
104104

105105
mysql=( mysql --protocol=socket -uroot -hlocalhost --socket="${SOCKET}" )
106106

107-
for i in {30..0}; do
107+
for i in {${MYSQL_START_TIMEOUT:-30}..0}; do
108108
if echo 'SELECT 1' | "${mysql[@]}" &> /dev/null; then
109109
break
110110
fi
111111
echo 'MySQL init process in progress...'
112112
sleep 1
113113
done
114114
if [ "$i" = 0 ]; then
115-
echo >&2 'MySQL init process failed.'
115+
echo >&2 'MySQL init process failed. Cleaning up..'
116+
rm -rf $DATADIR/mysql
116117
exit 1
117118
fi
118119

0 commit comments

Comments
 (0)