K8SPXC-1222: Remove state check for 5.7

build/pxc-entrypoint.sh

@@ -41,7 +41,7 @@
 	elif [ "${!fileVar:-}" ]; then
 		val="$(<"${!fileVar}")"
 	elif [ "${3:-}" ] && [ -f "/etc/mysql/mysql-users-secret/$3" ]; then
 		val="$(</etc/mysql/mysql-users-secret/$3)"
 	fi
 	export "$var"="$val"
 	unset "$fileVar"
@@ -60,7 +60,7 @@
 	case "$f" in
 	*.sh)
 		echo "$0: running $f"
 		. "$f"
 		;;
 	*.sql)
 		echo "$0: running $f"
@@ -248,7 +248,7 @@
 	i=$(curl "$DISCOVERY_SERVICE/v2/keys/pxc-cluster/queue/$CLUSTER_NAME" | jq -r '.node.nodes[].value')
 
 	# this remove my ip from the list
 	i1="${i[@]//$NODE_IP/}"
 
 	# Register the current IP in the discovery service
 	# key set to expire in 30 sec. There is a cronjob that should update them regularly
@@ -258,8 +258,8 @@
 
 	i=$(curl "$DISCOVERY_SERVICE/v2/keys/pxc-cluster/$CLUSTER_NAME/?quorum=true" | jq -r '.node.nodes[]?.key' | awk -F'/' '{print $(NF)}')
 	# this remove my ip from the list
 	i2="${i[@]//$NODE_IP/}"
 	CLUSTER_JOIN=$(join , $i1 $i2)
 
 	sed -r "s|^[#]?wsrep_node_address=.*$|wsrep_node_address=${NODE_IP}|" "${CFG}" 1<>"${CFG}"
 	sed -r "s|^[#]?wsrep_cluster_name=.*$|wsrep_cluster_name=${CLUSTER_NAME}|" "${CFG}" 1<>"${CFG}"
@@ -300,7 +300,7 @@
 
 # if we have CLUSTER_JOIN - then we do not need to perform datadir initialize
 # the data will be copied from another node
 if [ -z "$CLUSTER_JOIN" ] && [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
 	# still need to check config, container may have started with --user
 	_check_config "$@"
 
@@ -313,7 +313,7 @@
 	if [ ! -d "$DATADIR/mysql" ]; then
 		file_env 'MYSQL_ROOT_PASSWORD' '' 'root'
 		{ set +x; } 2>/dev/null
 		if [ -z "$MYSQL_ROOT_PASSWORD" -a -z "$MYSQL_ALLOW_EMPTY_PASSWORD" -a -z "$MYSQL_RANDOM_ROOT_PASSWORD" ]; then
 			echo >&2 'error: database is uninitialized and password option is not specified '
 			echo >&2 '  You need to specify one of MYSQL_ROOT_PASSWORD, MYSQL_ALLOW_EMPTY_PASSWORD and MYSQL_RANDOM_ROOT_PASSWORD'
 			exit 1
@@ -369,7 +369,7 @@
 		fi
 
 		{ set +x; } 2>/dev/null
 		if [ ! -z "$MYSQL_RANDOM_ROOT_PASSWORD" ]; then
 			MYSQL_ROOT_PASSWORD="$(pwmake 128)"
 			echo "GENERATED ROOT PASSWORD: $MYSQL_ROOT_PASSWORD"
 		fi
@@ -377,7 +377,7 @@
 		rootCreate=
 		# default root to listen for connections from anywhere
 		file_env 'MYSQL_ROOT_HOST' '%'
 		if [ ! -z "$MYSQL_ROOT_HOST" -a "$MYSQL_ROOT_HOST" != 'localhost' ]; then
 			# no, we don't care if read finds a terminating character in this heredoc
 			# https://unix.stackexchange.com/questions/265149/why-is-set-o-errexit-breaking-this-read-heredoc-expression/265151#265151
 			read -r -d '' rootCreate <<-EOSQL || true
@@ -434,7 +434,7 @@
 		EOSQL
 
 		{ set +x; } 2>/dev/null
 		if [ ! -z "$MYSQL_ROOT_PASSWORD" ]; then
 			mysql+=(-p"${MYSQL_ROOT_PASSWORD}")
 		fi
 		set -x
@@ -448,7 +448,7 @@
 		file_env 'MYSQL_USER'
 		file_env 'MYSQL_PASSWORD'
 		{ set +x; } 2>/dev/null
 		if [ "$MYSQL_USER" -a "$MYSQL_PASSWORD" ]; then
 			echo "CREATE USER '$MYSQL_USER'@'%' IDENTIFIED BY '$MYSQL_PASSWORD' ;" | "${mysql[@]}"
 
 			if [ "$MYSQL_DATABASE" ]; then
@@ -466,7 +466,7 @@
 		done
 
 		{ set +x; } 2>/dev/null
 		if [ ! -z "$MYSQL_ONETIME_PASSWORD" ]; then
 			"${mysql[@]}" <<-EOSQL
 				ALTER USER 'root'@'%' PASSWORD EXPIRE;
 			EOSQL
@@ -483,13 +483,13 @@
 	fi
 
 	# exit when MYSQL_INIT_ONLY environment variable is set to avoid starting mysqld
 	if [ ! -z "$MYSQL_INIT_ONLY" ]; then
 		echo 'Initialization complete, now exiting!'
 		exit 0
 	fi
 fi
 
 if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
 	# still need to check config, container may have started with --user
 	_check_config "$@"
 
@@ -504,37 +504,29 @@
 	pxc_version=''
 	if [ -f "$DATADIR/version_info" ]; then
 		pxc_version_file="$DATADIR/version_info"
 		pxc_version=$(cat "$pxc_version_file" | awk '{print $3}')
 	elif [ -f "$DATADIR/xtrabackup_info" ]; then
 		pxc_version_file="$DATADIR/xtrabackup_info"
 		pxc_version=$(grep 'server_version' "$pxc_version_file" | awk '{print $3}' | tr -d '\n')
 	fi
 
 	if [[ -f $pxc_version_file && -n $pxc_version && $MYSQL_VERSION == '5.7' ]] && [[ $(cat /tmp/version_info) != $pxc_version ]]; then
 		SOCKET="$(_get_config 'socket' "$@")"
 		"$@" --skip-networking --socket="${SOCKET}" --wsrep-provider='none' &
 		pid="$!"
 
 		mysql=(mysql --protocol=socket -uroot -hlocalhost --socket="${SOCKET}" --password="")
 		{ set +x; } 2>/dev/null
 		if [ ! -z "$MYSQL_ROOT_PASSWORD" ]; then
 			mysql+=(-p"${MYSQL_ROOT_PASSWORD}")
 		fi
 		set -x
 
-		if [[ "$MYSQL_VERSION" =~ ^(8\.0|8\.4)$ ]]; then
-			mysqlState="startup"
-			while [[ "${mysqlState}" != "ready" ]]; do
-				mysqlState=$(tr -d '\0' < ${MYSQL_STATE_FILE})
-				echo >&2 "MySQL upgrade process in progress..."
-				sleep 1
-			done
-		fi
 		for i in {120..0}; do
 			if echo 'SELECT 1' | "${mysql[@]}" &>/dev/null; then
 				break
 			fi
-
+			echo >&2 "MySQL upgrade process in progress..."
 			sleep 1
 		done
 		if [ "$i" = 0 ]; then
@@ -555,16 +547,16 @@
 POD_NAMESPACE=$(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace)
 
 wsrep_start_position_opt=""
 if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
 	DATADIR="$(_get_config 'datadir' "$@")"
 	grastate_loc="${DATADIR}/grastate.dat"
 	wsrep_verbose_logfile="$DATADIR/wsrep_recovery_verbose.log"
 	if [ -f "$wsrep_verbose_logfile" ]; then
 		cat "$wsrep_verbose_logfile" | tee -a "$DATADIR/wsrep_recovery_verbose_history.log"
 		rm -f "$wsrep_verbose_logfile"
 	fi
 
 	if [ -s "$grastate_loc" -a -d "$DATADIR/mysql" ]; then
 		uuid=$(grep 'uuid:' "$grastate_loc" | cut -d: -f2 | tr -d ' ' || :)
 		seqno=$(grep 'seqno:' "$grastate_loc" | cut -d: -f2 | tr -d ' ' || :)
 		safe_to_bootstrap=$(grep 'safe_to_bootstrap:' "$grastate_loc" | cut -d: -f2 | tr -d ' ' || :)
@@ -579,11 +571,11 @@
 		fi
 	fi
 
 	if [ -z "$wsrep_start_position_opt" -a -d "$DATADIR/mysql" ]; then
 		"$@" --wsrep_recover --log-error-verbosity=3 --log_error="$wsrep_verbose_logfile"
 
 		echo >&2 "WSREP: Print recovery logs: "
 		cat "$wsrep_verbose_logfile" | tee -a "$DATADIR/wsrep_recovery_verbose_history.log"
 		if grep ' Recovered position:' "$wsrep_verbose_logfile"; then
 			start_pos="$(
 				grep ' Recovered position:' "$wsrep_verbose_logfile" |
@@ -620,7 +612,7 @@
 				sed -i 's/safe_to_bootstrap: 0/safe_to_bootstrap: 1/g' "$grastate_loc"
 			fi
 			echo "Recovery was finished."
 			exec "$@" $wsrep_start_position_opt
 		}
 		function is_manual_recovery() {
 			set +o xtrace
@@ -673,7 +665,7 @@
 	fi
 fi
 
 test -e /opt/percona/hookscript/hook.sh && source /opt/percona/hookscript/hook.sh
 
 init_opt=""
 if [[ -f /etc/mysql/init-file/init.sql ]]; then
@@ -681,4 +673,4 @@
 	echo "Using init-file: /etc/mysql/init-file/init.sql"
 fi
 
 exec "$@" ${wsrep_start_position_opt} ${init_opt}