K8SPXC-1410 add PXC 8.4.X support #1878
Open
+735
−65
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
hors
requested review from
tplavcic,
nmarukovich,
ptankov,
jvpasinatto,
eleo007,
egegunes,
inelpandzic and
pooknull
as code owners
pull-request-size
bot
added
size/XL
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
| @@ -69,7 +69,7 @@ | |||
|
|
|||
| CFG=/etc/mysql/node.cnf | |||
| MYSQL_VERSION=$(mysqld -V | awk '{print $3}' | awk -F'.' '{print $1"."$2}') | |||
| if [ "$MYSQL_VERSION" == '8.0' ]; then | |||
| if [[ "$MYSQL_VERSION" =~ ^(8\.0|8\.4)$ ]]; then | |||
There was a problem hiding this comment.
[shfmt] reported by reviewdog 🐶
Suggested change
| if [[ "$MYSQL_VERSION" =~ ^(8\.0|8\.4)$ ]]; then | |
| if [[ $MYSQL_VERSION =~ ^(8\.0|8\.4)$ ]]; then |
| @@ -165,7 +165,7 @@ | |||
| sed -i "/\[mysqld\]/a early-plugin-load=keyring_vault.so" $CFG | |||
| sed -i "/\[mysqld\]/a keyring_vault_config=$vault_secret" $CFG | |||
|
|
|||
| if [ "$MYSQL_VERSION" == '8.0' ]; then | |||
| if [[ "$MYSQL_VERSION" =~ ^(8\.0|8\.4)$ ]]; then | |||
There was a problem hiding this comment.
[shfmt] reported by reviewdog 🐶
Suggested change
| if [[ "$MYSQL_VERSION" =~ ^(8\.0|8\.4)$ ]]; then | |
| if [[ $MYSQL_VERSION =~ ^(8\.0|8\.4)$ ]]; then |
| @@ -293,14 +292,13 @@ | |||
| echo "Cluster name is invalid, please check DNS" | |||
| exit 1 | |||
| fi | |||
|
|
|||
| if [[ -n ${NOTIFY_SOCKET} && ${MYSQL_VERSION} == '8.0' ]]; then | |||
| if [[ -n ${NOTIFY_SOCKET} && ${MYSQL_VERSION} =~ ^(8\.0|8\.4)$ ]]; then | |||
| nohup /var/lib/mysql/mysql-state-monitor >/var/lib/mysql/mysql-state-monitor.log 2>&1 < /dev/null & | |||
There was a problem hiding this comment.
[shfmt] reported by reviewdog 🐶
Suggested change
| nohup /var/lib/mysql/mysql-state-monitor >/var/lib/mysql/mysql-state-monitor.log 2>&1 < /dev/null & | |
| nohup /var/lib/mysql/mysql-state-monitor >/var/lib/mysql/mysql-state-monitor.log 2>&1 </dev/null & |
| @@ -385,15 +387,15 @@ | |||
| file_env 'MONITOR_HOST' 'localhost' | |||
| file_env 'MONITOR_PASSWORD' 'monitor' 'monitor' | |||
| file_env 'REPLICATION_PASSWORD' 'replication' 'replication' | |||
| if [ "$MYSQL_VERSION" == '8.0' ]; then | |||
| if [[ "$MYSQL_VERSION" =~ ^(8\.0|8\.4)$ ]]; then | |||
There was a problem hiding this comment.
[shfmt] reported by reviewdog 🐶
Suggested change
| if [[ "$MYSQL_VERSION" =~ ^(8\.0|8\.4)$ ]]; then | |
| if [[ $MYSQL_VERSION =~ ^(8\.0|8\.4)$ ]]; then |
| fi | ||
| set -x | ||
|
|
||
| if [[ ${MYSQL_VERSION} == '8.0' ]]; then | ||
| if [[ "$MYSQL_VERSION" =~ ^(8\.0|8\.4)$ ]]; then |
There was a problem hiding this comment.
[shfmt] reported by reviewdog 🐶
Suggested change
| if [[ "$MYSQL_VERSION" =~ ^(8\.0|8\.4)$ ]]; then | |
| if [[ $MYSQL_VERSION =~ ^(8\.0|8\.4)$ ]]; then |
Comment on lines
525
to
526
| while [[ "${mysqlState}" != "ready" ]]; do | ||
| mysqlState=$(tr -d '\0' < ${MYSQL_STATE_FILE}) |
There was a problem hiding this comment.
[shfmt] reported by reviewdog 🐶
Suggested change
| while [[ "${mysqlState}" != "ready" ]]; do | |
| mysqlState=$(tr -d '\0' < ${MYSQL_STATE_FILE}) | |
| while [[ ${mysqlState} != "ready" ]]; do | |
| mysqlState=$(tr -d '\0' <${MYSQL_STATE_FILE}) |
commit: 48999f7 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
CHANGE DESCRIPTION
Problem:
Short explanation of the problem.
Cause:
Short explanation of the root cause of the issue if applicable.
Solution:
Short explanation of the solution we are providing with this PR.
CHECKLIST
Jira
Needs Doc) and QA (Needs QA)?Tests
compare/*-oc.yml)?Config/Logging/Testability