Skip to content

Commit

Permalink
K8SPXC-1222: assign MYSQL_VERSION variable in liveness and readiness (p…
Browse files Browse the repository at this point in the history
…ercona#1895)

* K8SPXC-1222: assign MYSQL_VERSION variable in liveness and readiness check

* fix wrong state after running mysqld

* fix backup example

* fix tests

* Update build/pxc-entrypoint.sh

* Add MYSQL_NOTIFY_SOCKET & MYSQL_STATE_FILE to update-consistency tests

* remove k127 compare for upgrade-consistency and extra MYSQL_NOTIFY_SOCKET

---------

Co-authored-by: Ege Güneş <[email protected]>
Co-authored-by: Viacheslav Sarzhan <[email protected]>
  • Loading branch information
3 people authored Dec 6, 2024
1 parent d233d90 commit ad71ccb
Show file tree
Hide file tree
Showing 103 changed files with 105 additions and 650 deletions.
1 change: 1 addition & 0 deletions build/liveness-check.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ NODE_IP=$(hostname -I | awk ' { print $1 } ')
#Timeout exists for instances where mysqld may be hung
TIMEOUT=$((${LIVENESS_CHECK_TIMEOUT:-5} - 1))
MYSQL_STATE=ready
MYSQL_VERSION=$(mysqld -V | awk '{print $3}' | awk -F'.' '{print $1"."$2}')
if [[ ${MYSQL_VERSION} == '8.0' ]]; then
MYSQL_STATE=$(tr -d '\0' < ${MYSQL_STATE_FILE})
fi
Expand Down
4 changes: 3 additions & 1 deletion build/pxc-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,9 @@ if [[ -z ${WSREP_CLUSTER_NAME} || ${WSREP_CLUSTER_NAME} == 'noname' ]]; then
echo "Cluster name is invalid, please check DNS"
exit 1
fi
if [[ -n ${NOTIFY_SOCKET} && ${MYSQL_VERSION} =~ ^(8\.0|8\.4)$ ]]; then

if [[ -n ${MYSQL_NOTIFY_SOCKET} && ${MYSQL_VERSION} =~ ^(8\.0|8\.4)$ ]]; then
export NOTIFY_SOCKET=${MYSQL_NOTIFY_SOCKET}
nohup /var/lib/mysql/mysql-state-monitor >/var/lib/mysql/mysql-state-monitor.log 2>&1 < /dev/null &
fi

Expand Down
1 change: 1 addition & 0 deletions build/readiness-check.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ DEFAULTS_EXTRA_FILE=${DEFAULTS_EXTRA_FILE:-/etc/my.cnf}
AVAILABLE_WHEN_DONOR=${AVAILABLE_WHEN_DONOR:-1}
NODE_IP=$(hostname -I | awk ' { print $1 } ')
MYSQL_STATE=ready
MYSQL_VERSION=$(mysqld -V | awk '{print $3}' | awk -F'.' '{print $1"."$2}')
if [[ ${MYSQL_VERSION} == '8.0' ]]; then
MYSQL_STATE=$(tr -d '\0' < ${MYSQL_STATE_FILE})
fi
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ spec:
value: "15"
- name: DEFAULT_AUTHENTICATION_PLUGIN
value: mysql_native_password
- name: NOTIFY_SOCKET
- name: MYSQL_NOTIFY_SOCKET
value: /var/lib/mysql/notify.sock
- name: MYSQL_STATE_FILE
value: /var/lib/mysql/mysql.state
Expand Down
2 changes: 1 addition & 1 deletion e2e-tests/affinity/compare/statefulset_custom-pxc-k127.yml
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ spec:
value: "15"
- name: DEFAULT_AUTHENTICATION_PLUGIN
value: mysql_native_password
- name: NOTIFY_SOCKET
- name: MYSQL_NOTIFY_SOCKET
value: /var/lib/mysql/notify.sock
- name: MYSQL_STATE_FILE
value: /var/lib/mysql/mysql.state
Expand Down
2 changes: 1 addition & 1 deletion e2e-tests/affinity/compare/statefulset_custom-pxc-oc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ spec:
value: "15"
- name: DEFAULT_AUTHENTICATION_PLUGIN
value: mysql_native_password
- name: NOTIFY_SOCKET
- name: MYSQL_NOTIFY_SOCKET
value: /var/lib/mysql/notify.sock
- name: MYSQL_STATE_FILE
value: /var/lib/mysql/mysql.state
Expand Down
2 changes: 1 addition & 1 deletion e2e-tests/affinity/compare/statefulset_custom-pxc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ spec:
value: "15"
- name: DEFAULT_AUTHENTICATION_PLUGIN
value: mysql_native_password
- name: NOTIFY_SOCKET
- name: MYSQL_NOTIFY_SOCKET
value: /var/lib/mysql/notify.sock
- name: MYSQL_STATE_FILE
value: /var/lib/mysql/mysql.state
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ spec:
value: "15"
- name: DEFAULT_AUTHENTICATION_PLUGIN
value: mysql_native_password
- name: NOTIFY_SOCKET
- name: MYSQL_NOTIFY_SOCKET
value: /var/lib/mysql/notify.sock
- name: MYSQL_STATE_FILE
value: /var/lib/mysql/mysql.state
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ spec:
value: "15"
- name: DEFAULT_AUTHENTICATION_PLUGIN
value: mysql_native_password
- name: NOTIFY_SOCKET
- name: MYSQL_NOTIFY_SOCKET
value: /var/lib/mysql/notify.sock
- name: MYSQL_STATE_FILE
value: /var/lib/mysql/mysql.state
Expand Down
2 changes: 1 addition & 1 deletion e2e-tests/affinity/compare/statefulset_hostname-pxc-oc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ spec:
value: "15"
- name: DEFAULT_AUTHENTICATION_PLUGIN
value: mysql_native_password
- name: NOTIFY_SOCKET
- name: MYSQL_NOTIFY_SOCKET
value: /var/lib/mysql/notify.sock
- name: MYSQL_STATE_FILE
value: /var/lib/mysql/mysql.state
Expand Down
2 changes: 1 addition & 1 deletion e2e-tests/affinity/compare/statefulset_hostname-pxc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ spec:
value: "15"
- name: DEFAULT_AUTHENTICATION_PLUGIN
value: mysql_native_password
- name: NOTIFY_SOCKET
- name: MYSQL_NOTIFY_SOCKET
value: /var/lib/mysql/notify.sock
- name: MYSQL_STATE_FILE
value: /var/lib/mysql/mysql.state
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ spec:
value: "15"
- name: DEFAULT_AUTHENTICATION_PLUGIN
value: mysql_native_password
- name: NOTIFY_SOCKET
- name: MYSQL_NOTIFY_SOCKET
value: /var/lib/mysql/notify.sock
- name: MYSQL_STATE_FILE
value: /var/lib/mysql/mysql.state
Expand Down
2 changes: 1 addition & 1 deletion e2e-tests/affinity/compare/statefulset_region-pxc-k127.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ spec:
value: "15"
- name: DEFAULT_AUTHENTICATION_PLUGIN
value: mysql_native_password
- name: NOTIFY_SOCKET
- name: MYSQL_NOTIFY_SOCKET
value: /var/lib/mysql/notify.sock
- name: MYSQL_STATE_FILE
value: /var/lib/mysql/mysql.state
Expand Down
2 changes: 1 addition & 1 deletion e2e-tests/affinity/compare/statefulset_region-pxc-oc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ spec:
value: "15"
- name: DEFAULT_AUTHENTICATION_PLUGIN
value: mysql_native_password
- name: NOTIFY_SOCKET
- name: MYSQL_NOTIFY_SOCKET
value: /var/lib/mysql/notify.sock
- name: MYSQL_STATE_FILE
value: /var/lib/mysql/mysql.state
Expand Down
2 changes: 1 addition & 1 deletion e2e-tests/affinity/compare/statefulset_region-pxc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ spec:
value: "15"
- name: DEFAULT_AUTHENTICATION_PLUGIN
value: mysql_native_password
- name: NOTIFY_SOCKET
- name: MYSQL_NOTIFY_SOCKET
value: /var/lib/mysql/notify.sock
- name: MYSQL_STATE_FILE
value: /var/lib/mysql/mysql.state
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ spec:
value: "15"
- name: DEFAULT_AUTHENTICATION_PLUGIN
value: mysql_native_password
- name: NOTIFY_SOCKET
- name: MYSQL_NOTIFY_SOCKET
value: /var/lib/mysql/notify.sock
- name: MYSQL_STATE_FILE
value: /var/lib/mysql/mysql.state
Expand Down
2 changes: 1 addition & 1 deletion e2e-tests/affinity/compare/statefulset_zone-pxc-k127.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ spec:
value: "15"
- name: DEFAULT_AUTHENTICATION_PLUGIN
value: mysql_native_password
- name: NOTIFY_SOCKET
- name: MYSQL_NOTIFY_SOCKET
value: /var/lib/mysql/notify.sock
- name: MYSQL_STATE_FILE
value: /var/lib/mysql/mysql.state
Expand Down
2 changes: 1 addition & 1 deletion e2e-tests/affinity/compare/statefulset_zone-pxc-oc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ spec:
value: "15"
- name: DEFAULT_AUTHENTICATION_PLUGIN
value: mysql_native_password
- name: NOTIFY_SOCKET
- name: MYSQL_NOTIFY_SOCKET
value: /var/lib/mysql/notify.sock
- name: MYSQL_STATE_FILE
value: /var/lib/mysql/mysql.state
Expand Down
2 changes: 1 addition & 1 deletion e2e-tests/affinity/compare/statefulset_zone-pxc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ spec:
value: "15"
- name: DEFAULT_AUTHENTICATION_PLUGIN
value: mysql_native_password
- name: NOTIFY_SOCKET
- name: MYSQL_NOTIFY_SOCKET
value: /var/lib/mysql/notify.sock
- name: MYSQL_STATE_FILE
value: /var/lib/mysql/mysql.state
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ spec:
value: "15"
- name: DEFAULT_AUTHENTICATION_PLUGIN
value: caching_sha2_password
- name: NOTIFY_SOCKET
- name: MYSQL_NOTIFY_SOCKET
value: /var/lib/mysql/notify.sock
- name: MYSQL_STATE_FILE
value: /var/lib/mysql/mysql.state
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ spec:
value: "15"
- name: DEFAULT_AUTHENTICATION_PLUGIN
value: caching_sha2_password
- name: NOTIFY_SOCKET
- name: MYSQL_NOTIFY_SOCKET
value: /var/lib/mysql/notify.sock
- name: MYSQL_STATE_FILE
value: /var/lib/mysql/mysql.state
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ spec:
value: "15"
- name: DEFAULT_AUTHENTICATION_PLUGIN
value: caching_sha2_password
- name: NOTIFY_SOCKET
- name: MYSQL_NOTIFY_SOCKET
value: /var/lib/mysql/notify.sock
- name: MYSQL_STATE_FILE
value: /var/lib/mysql/mysql.state
Expand Down
2 changes: 1 addition & 1 deletion e2e-tests/default-cr/compare/statefulset_cluster1-pxc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ spec:
value: "15"
- name: DEFAULT_AUTHENTICATION_PLUGIN
value: caching_sha2_password
- name: NOTIFY_SOCKET
- name: MYSQL_NOTIFY_SOCKET
value: /var/lib/mysql/notify.sock
- name: MYSQL_STATE_FILE
value: /var/lib/mysql/mysql.state
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ spec:
value: "15"
- name: DEFAULT_AUTHENTICATION_PLUGIN
value: caching_sha2_password
- name: NOTIFY_SOCKET
- name: MYSQL_NOTIFY_SOCKET
value: /var/lib/mysql/notify.sock
- name: MYSQL_STATE_FILE
value: /var/lib/mysql/mysql.state
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ spec:
value: "15"
- name: DEFAULT_AUTHENTICATION_PLUGIN
value: caching_sha2_password
- name: NOTIFY_SOCKET
- name: MYSQL_NOTIFY_SOCKET
value: /var/lib/mysql/notify.sock
- name: MYSQL_STATE_FILE
value: /var/lib/mysql/mysql.state
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ spec:
value: "15"
- name: DEFAULT_AUTHENTICATION_PLUGIN
value: caching_sha2_password
- name: NOTIFY_SOCKET
- name: MYSQL_NOTIFY_SOCKET
value: /var/lib/mysql/notify.sock
- name: MYSQL_STATE_FILE
value: /var/lib/mysql/mysql.state
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ spec:
value: "15"
- name: DEFAULT_AUTHENTICATION_PLUGIN
value: caching_sha2_password
- name: NOTIFY_SOCKET
- name: MYSQL_NOTIFY_SOCKET
value: /var/lib/mysql/notify.sock
- name: MYSQL_STATE_FILE
value: /var/lib/mysql/mysql.state
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ spec:
value: "15"
- name: DEFAULT_AUTHENTICATION_PLUGIN
value: caching_sha2_password
- name: NOTIFY_SOCKET
- name: MYSQL_NOTIFY_SOCKET
value: /var/lib/mysql/notify.sock
- name: MYSQL_STATE_FILE
value: /var/lib/mysql/mysql.state
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ spec:
value: "15"
- name: DEFAULT_AUTHENTICATION_PLUGIN
value: caching_sha2_password
- name: NOTIFY_SOCKET
- name: MYSQL_NOTIFY_SOCKET
value: /var/lib/mysql/notify.sock
- name: MYSQL_STATE_FILE
value: /var/lib/mysql/mysql.state
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ spec:
value: "15"
- name: DEFAULT_AUTHENTICATION_PLUGIN
value: caching_sha2_password
- name: NOTIFY_SOCKET
- name: MYSQL_NOTIFY_SOCKET
value: /var/lib/mysql/notify.sock
- name: MYSQL_STATE_FILE
value: /var/lib/mysql/mysql.state
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ spec:
value: "15"
- name: DEFAULT_AUTHENTICATION_PLUGIN
value: caching_sha2_password
- name: NOTIFY_SOCKET
- name: MYSQL_NOTIFY_SOCKET
value: /var/lib/mysql/notify.sock
- name: MYSQL_STATE_FILE
value: /var/lib/mysql/mysql.state
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ spec:
value: "15"
- name: DEFAULT_AUTHENTICATION_PLUGIN
value: mysql_native_password
- name: NOTIFY_SOCKET
- name: MYSQL_NOTIFY_SOCKET
value: /var/lib/mysql/notify.sock
- name: MYSQL_STATE_FILE
value: /var/lib/mysql/mysql.state
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ spec:
value: "15"
- name: DEFAULT_AUTHENTICATION_PLUGIN
value: mysql_native_password
- name: NOTIFY_SOCKET
- name: MYSQL_NOTIFY_SOCKET
value: /var/lib/mysql/notify.sock
- name: MYSQL_STATE_FILE
value: /var/lib/mysql/mysql.state
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ spec:
value: "15"
- name: DEFAULT_AUTHENTICATION_PLUGIN
value: mysql_native_password
- name: NOTIFY_SOCKET
- name: MYSQL_NOTIFY_SOCKET
value: /var/lib/mysql/notify.sock
- name: MYSQL_STATE_FILE
value: /var/lib/mysql/mysql.state
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ spec:
value: "15"
- name: DEFAULT_AUTHENTICATION_PLUGIN
value: mysql_native_password
- name: NOTIFY_SOCKET
- name: MYSQL_NOTIFY_SOCKET
value: /var/lib/mysql/notify.sock
- name: MYSQL_STATE_FILE
value: /var/lib/mysql/mysql.state
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ spec:
value: "15"
- name: DEFAULT_AUTHENTICATION_PLUGIN
value: mysql_native_password
- name: NOTIFY_SOCKET
- name: MYSQL_NOTIFY_SOCKET
value: /var/lib/mysql/notify.sock
- name: MYSQL_STATE_FILE
value: /var/lib/mysql/mysql.state
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ spec:
value: "15"
- name: DEFAULT_AUTHENTICATION_PLUGIN
value: mysql_native_password
- name: NOTIFY_SOCKET
- name: MYSQL_NOTIFY_SOCKET
value: /var/lib/mysql/notify.sock
- name: MYSQL_STATE_FILE
value: /var/lib/mysql/mysql.state
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ spec:
value: "15"
- name: DEFAULT_AUTHENTICATION_PLUGIN
value: mysql_native_password
- name: NOTIFY_SOCKET
- name: MYSQL_NOTIFY_SOCKET
value: /var/lib/mysql/notify.sock
- name: MYSQL_STATE_FILE
value: /var/lib/mysql/mysql.state
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ spec:
value: "15"
- name: DEFAULT_AUTHENTICATION_PLUGIN
value: mysql_native_password
- name: NOTIFY_SOCKET
- name: MYSQL_NOTIFY_SOCKET
value: /var/lib/mysql/notify.sock
- name: MYSQL_STATE_FILE
value: /var/lib/mysql/mysql.state
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ spec:
value: "15"
- name: DEFAULT_AUTHENTICATION_PLUGIN
value: mysql_native_password
- name: NOTIFY_SOCKET
- name: MYSQL_NOTIFY_SOCKET
value: /var/lib/mysql/notify.sock
- name: MYSQL_STATE_FILE
value: /var/lib/mysql/mysql.state
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ spec:
value: "15"
- name: DEFAULT_AUTHENTICATION_PLUGIN
value: mysql_native_password
- name: NOTIFY_SOCKET
- name: MYSQL_NOTIFY_SOCKET
value: /var/lib/mysql/notify.sock
- name: MYSQL_STATE_FILE
value: /var/lib/mysql/mysql.state
Expand Down
2 changes: 1 addition & 1 deletion e2e-tests/limits/compare/statefulset_no-limits-pxc-oc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ spec:
value: "15"
- name: DEFAULT_AUTHENTICATION_PLUGIN
value: mysql_native_password
- name: NOTIFY_SOCKET
- name: MYSQL_NOTIFY_SOCKET
value: /var/lib/mysql/notify.sock
- name: MYSQL_STATE_FILE
value: /var/lib/mysql/mysql.state
Expand Down
2 changes: 1 addition & 1 deletion e2e-tests/limits/compare/statefulset_no-limits-pxc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ spec:
value: "15"
- name: DEFAULT_AUTHENTICATION_PLUGIN
value: mysql_native_password
- name: NOTIFY_SOCKET
- name: MYSQL_NOTIFY_SOCKET
value: /var/lib/mysql/notify.sock
- name: MYSQL_STATE_FILE
value: /var/lib/mysql/mysql.state
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ spec:
value: "15"
- name: DEFAULT_AUTHENTICATION_PLUGIN
value: mysql_native_password
- name: NOTIFY_SOCKET
- name: MYSQL_NOTIFY_SOCKET
value: /var/lib/mysql/notify.sock
- name: MYSQL_STATE_FILE
value: /var/lib/mysql/mysql.state
Expand Down
Loading

0 comments on commit ad71ccb

Please sign in to comment.