Merge pull request #1015 from percona/K8SPS-265_fix_heartbeat

K8SPS-265 fix heartbeat

Author: hors

build/heartbeat-entrypoint.sh

@@ -30,6 +30,9 @@ for i in {1..5}; do
 	fi
 done
 
+# If password contains commas they must be escaped with a backslash: “exam,ple” according https://docs.percona.com/percona-toolkit/pt-heartbeat.html
+ESCAPED_HEARTBEAT_PASSWORD="${HEARTBEAT_PASSWORD//,/\\,}"
+
 HEARTBEAT_USER='heartbeat'
 echo "[INFO] pt-heartbeat --update --replace --fail-successive-errors 20 --check-read-only --create-table --database sys_operator \
 	--table heartbeat --user ${HEARTBEAT_USER} --password XXXX --port ${MYSQL_ADMIN_PORT}"
@@ -43,5 +46,5 @@ pt-heartbeat \
 	--database sys_operator \
 	--table heartbeat \
 	--user "${HEARTBEAT_USER}" \
-	--password "${HEARTBEAT_PASSWORD}" \
+	--password "${ESCAPED_HEARTBEAT_PASSWORD}" \
 	--port "${MYSQL_ADMIN_PORT}"

build/ps-entrypoint.sh

@@ -42,7 +42,6 @@ file_env() {
 	fi
 	export "$var"="$val"
 	unset "$fileVar"
-	set -o xtrace
 }
 
 # usage: process_init_file FILENAME MYSQLCOMMAND...
@@ -294,7 +293,6 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
 			MYSQL_ROOT_PASSWORD="$(pwmake 128)"
 			echo "GENERATED ROOT PASSWORD: $MYSQL_ROOT_PASSWORD"
 		fi
-		set -x
 
 		rootCreate=
 		# default root to listen for connections from anywhere
@@ -366,7 +364,6 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
 			FLUSH PRIVILEGES ;
 		EOSQL
 
-		{ set +x; } 2>/dev/null
 		if [ -n "$MYSQL_ROOT_PASSWORD" ]; then
 			mysql+=(-p"${MYSQL_ROOT_PASSWORD}")
 		fi