From eb35fca2fbb292f9057979f98ca96f021992543a Mon Sep 17 00:00:00 2001 From: Viacheslav Sarzhan Date: Wed, 20 Nov 2024 23:53:11 +0200 Subject: [PATCH 1/5] K8SPXC-1410 add PXC 8.4 support --- build/pxc-configure-pxc.sh | 2 +- build/pxc-entrypoint.sh | 24 ++++++++++--------- .../statefulset_custom-pxc-k127-oc.yml | 2 +- .../compare/statefulset_custom-pxc-k127.yml | 2 +- .../statefulset_hostname-pxc-k127-oc.yml | 2 +- .../compare/statefulset_hostname-pxc-k127.yml | 2 +- .../statefulset_region-pxc-k127-oc.yml | 2 +- .../compare/statefulset_region-pxc-k127.yml | 2 +- .../compare/statefulset_zone-pxc-k127-oc.yml | 2 +- .../compare/statefulset_zone-pxc-k127.yml | 2 +- e2e-tests/affinity/conf/custom.yml | 2 +- e2e-tests/affinity/conf/hostname.yml | 2 +- e2e-tests/affinity/conf/region.yml | 2 +- e2e-tests/affinity/conf/zone.yml | 2 +- .../conf/auto-tuning-with-limits.yml | 2 +- .../auto-tuning-with-template-transform.yml | 2 +- .../conf/auto-tuning-with-template.yml | 4 ++-- e2e-tests/auto-tuning/run | 4 ++-- e2e-tests/conf/some-name.yml | 2 +- .../cross-site/conf/cross-site-replica.yml | 2 +- .../cross-site/conf/cross-site-source.yml | 2 +- .../conf/demand-backup-cloud.yml | 2 +- .../demand-backup/conf/demand-backup.yml | 2 +- e2e-tests/functions | 10 ++++++++ e2e-tests/haproxy/conf/haproxy.yml | 2 +- .../compare/max_allowed_packet-1-84.sql | 1 + e2e-tests/init-deploy/compare/monitor-84.sql | 3 +++ e2e-tests/init-deploy/compare/root-84.sql | 2 ++ .../statefulset_some-name-pxc-k127-oc.yml | 2 +- .../statefulset_some-name-pxc-k127.yml | 2 +- .../init-deploy/compare/xtrabackup-84.sql | 2 ++ ...lset_no-requests-pxc-increased-k127-oc.yml | 2 +- ...efulset_no-requests-pxc-increased-k127.yml | 2 +- .../statefulset_no-requests-pxc-k127-oc.yml | 2 +- .../statefulset_no-requests-pxc-k127.yml | 2 +- e2e-tests/limits/conf/no-requests.yml | 2 +- .../pitr-gap-errors/conf/pitr-gap-errors.yml | 2 +- e2e-tests/pitr/conf/pitr.yml | 2 +- .../conf/side-car.yml | 2 +- e2e-tests/pvc-resize/conf/some-name-eks.yml | 2 +- e2e-tests/pvc-resize/conf/some-name.yml | 2 +- ...atefulset_sec-context-pxc-changes-k127.yml | 2 +- .../statefulset_sec-context-pxc-k127.yml | 2 +- .../conf/sec-context-changes.yml | 2 +- .../security-context/conf/sec-context.yml | 2 +- .../conf/some-name-tls-issue-haproxy.yml | 2 +- .../conf/some-name-tls-issue.yml | 2 +- ...statefulset_some-name-pxc-1140-k127-oc.yml | 2 +- .../statefulset_some-name-pxc-1140-k127.yml | 2 +- ...statefulset_some-name-pxc-1150-k127-oc.yml | 2 +- .../statefulset_some-name-pxc-1150-k127.yml | 2 +- ...statefulset_some-name-pxc-1160-k127-oc.yml | 2 +- .../statefulset_some-name-pxc-1160-k127.yml | 2 +- e2e-tests/users/conf/some-name.yml | 2 +- 54 files changed, 81 insertions(+), 61 deletions(-) create mode 100644 e2e-tests/init-deploy/compare/max_allowed_packet-1-84.sql create mode 100644 e2e-tests/init-deploy/compare/monitor-84.sql create mode 100644 e2e-tests/init-deploy/compare/root-84.sql create mode 100644 e2e-tests/init-deploy/compare/xtrabackup-84.sql diff --git a/build/pxc-configure-pxc.sh b/build/pxc-configure-pxc.sh index 70aa36fa3b..7404c3c369 100755 --- a/build/pxc-configure-pxc.sh +++ b/build/pxc-configure-pxc.sh @@ -69,7 +69,7 @@ fi 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 grep -E -q "^[#]?admin-address" "$CFG" || sed '/^\[mysqld\]/a admin-address=\n' ${CFG} 1<>${CFG} grep -E -q "^[#]?log_error_suppression_list" "$CFG" || sed '/^\[mysqld\]/a log_error_suppression_list="MY-010055"\n' ${CFG} 1<>${CFG} else diff --git a/build/pxc-entrypoint.sh b/build/pxc-entrypoint.sh index 13d82784e4..571e2875e8 100755 --- a/build/pxc-entrypoint.sh +++ b/build/pxc-entrypoint.sh @@ -165,7 +165,7 @@ if [ -f "$vault_secret" ]; then 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 sed -i "/\[mysqld\]/a default_table_encryption=ON" $CFG sed -i "/\[mysqld\]/a table_encryption_privilege_check=ON" $CFG sed -i "/\[mysqld\]/a innodb_undo_log_encrypt=ON" $CFG @@ -189,12 +189,10 @@ fi grep -q "^progress=" $CFG && sed -i "s|^progress=.*|progress=1|" $CFG grep -q "^\[sst\]" "$CFG" || printf '[sst]\n' >>"$CFG" grep -q "^cpat=" "$CFG" || sed '/^\[sst\]/a cpat=.*\\.pem$\\|.*init\\.ok$\\|.*galera\\.cache$\\|.*wsrep_recovery_verbose\\.log$\\|.*readiness-check\\.sh$\\|.*liveness-check\\.sh$\\|.*get-pxc-state$\\|.*sst_in_progress$\\|.*sleep-forever$\\|.*pmm-prerun\\.sh$\\|.*sst-xb-tmpdir$\\|.*\\.sst$\\|.*gvwstate\\.dat$\\|.*grastate\\.dat$\\|.*\\.err$\\|.*\\.log$\\|.*RPM_UPGRADE_MARKER$\\|.*RPM_UPGRADE_HISTORY$\\|.*pxc-entrypoint\\.sh$\\|.*unsafe-bootstrap\\.sh$\\|.*pxc-configure-pxc\\.sh\\|.*peer-list$\\|.*auth_plugin$\\|.*version_info$' "$CFG" 1<>"$CFG" -if [[ $MYSQL_VERSION == '8.0' ]]; then - if [[ $MYSQL_PATCH_VERSION -ge 26 ]]; then - grep -q "^skip_replica_start=ON" "$CFG" || sed -i "/\[mysqld\]/a skip_replica_start=ON" $CFG - else - grep -q "^skip_slave_start=ON" "$CFG" || sed -i "/\[mysqld\]/a skip_slave_start=ON" $CFG - fi +if [[ $MYSQL_VERSION == '8.0' && $MYSQL_PATCH_VERSION -ge 26]] || [[ $MYSQL_VERSION == "8.4" ]]; then + grep -q "^skip_replica_start=ON" "$CFG" || sed -i "/\[mysqld\]/a skip_replica_start=ON" $CFG +else + grep -q "^skip_slave_start=ON" "$CFG" || sed -i "/\[mysqld\]/a skip_slave_start=ON" $CFG fi auth_plugin=${DEFAULT_AUTHENTICATION_PLUGIN} @@ -220,7 +218,7 @@ fi echo "${auth_plugin}" >/var/lib/mysql/auth_plugin sed -i "/default_authentication_plugin/d" $CFG -if [[ $MYSQL_VERSION == '8.0' && $MYSQL_PATCH_VERSION -ge 27 ]]; then +if [[ $MYSQL_VERSION == '8.0' && $MYSQL_PATCH_VERSION -ge 27 ]] || [[ $MYSQL_VERSION == "8.4" ]]; then sed -i "/\[mysqld\]/a authentication_policy=${auth_plugin},," $CFG else sed -i "/\[mysqld\]/a default_authentication_plugin=${auth_plugin}" $CFG @@ -324,7 +322,11 @@ if [ -z "$CLUSTER_JOIN" ] && [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then echo 'Initializing database' # we initialize database into $TMPDIR because "--initialize-insecure" option does not work if directory is not empty # in some cases storage driver creates unremovable artifacts (see K8SPXC-286), so $DATADIR cleanup is not possible - "$@" --initialize-insecure --skip-ssl --datadir="$TMPDIR" + if [[ $MYSQL_VERSION == "8.4" ]]; then + "$@" --initialize-insecure --datadir="$TMPDIR" + else + "$@" --initialize-insecure --skip-ssl --datadir="$TMPDIR" + fi mv "$TMPDIR"/* "$DATADIR/" rm -rfv "$TMPDIR" echo 'Database initialized' @@ -382,7 +384,7 @@ if [ -z "$CLUSTER_JOIN" ] && [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then 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 read -r -d '' monitorConnectGrant <<-EOSQL || true GRANT SERVICE_CONNECTION_ADMIN ON *.* TO 'monitor'@'${MONITOR_HOST}'; EOSQL @@ -390,7 +392,7 @@ if [ -z "$CLUSTER_JOIN" ] && [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then # SYSTEM_USER since 8.0.16 # https://dev.mysql.com/doc/refman/8.0/en/privileges-provided.html#priv_system-user - if [[ $MYSQL_VERSION == "8.0" ]] && ((MYSQL_PATCH_VERSION >= 16)); then + if [[ $MYSQL_VERSION == "8.0" ]] && ((MYSQL_PATCH_VERSION >= 16)) || [[ $MYSQL_VERSION == "8.4" ]]; then read -r -d '' systemUserGrant <<-EOSQL || true GRANT SYSTEM_USER ON *.* TO 'monitor'@'${MONITOR_HOST}'; EOSQL diff --git a/e2e-tests/affinity/compare/statefulset_custom-pxc-k127-oc.yml b/e2e-tests/affinity/compare/statefulset_custom-pxc-k127-oc.yml index 027f357e07..351c204b19 100644 --- a/e2e-tests/affinity/compare/statefulset_custom-pxc-k127-oc.yml +++ b/e2e-tests/affinity/compare/statefulset_custom-pxc-k127-oc.yml @@ -151,7 +151,7 @@ spec: resources: limits: cpu: "1" - memory: 1G + memory: 2G requests: cpu: 600m memory: 1G diff --git a/e2e-tests/affinity/compare/statefulset_custom-pxc-k127.yml b/e2e-tests/affinity/compare/statefulset_custom-pxc-k127.yml index 27467e0a86..ee115322d8 100644 --- a/e2e-tests/affinity/compare/statefulset_custom-pxc-k127.yml +++ b/e2e-tests/affinity/compare/statefulset_custom-pxc-k127.yml @@ -151,7 +151,7 @@ spec: resources: limits: cpu: "1" - memory: 1G + memory: 2G requests: cpu: 600m memory: 1G diff --git a/e2e-tests/affinity/compare/statefulset_hostname-pxc-k127-oc.yml b/e2e-tests/affinity/compare/statefulset_hostname-pxc-k127-oc.yml index 57e54e0902..5c0682df6c 100644 --- a/e2e-tests/affinity/compare/statefulset_hostname-pxc-k127-oc.yml +++ b/e2e-tests/affinity/compare/statefulset_hostname-pxc-k127-oc.yml @@ -124,7 +124,7 @@ spec: resources: limits: cpu: "1" - memory: 1G + memory: 2G requests: cpu: 600m memory: 1G diff --git a/e2e-tests/affinity/compare/statefulset_hostname-pxc-k127.yml b/e2e-tests/affinity/compare/statefulset_hostname-pxc-k127.yml index 5a1314fb7f..50ce05e9e4 100644 --- a/e2e-tests/affinity/compare/statefulset_hostname-pxc-k127.yml +++ b/e2e-tests/affinity/compare/statefulset_hostname-pxc-k127.yml @@ -124,7 +124,7 @@ spec: resources: limits: cpu: "1" - memory: 1G + memory: 2G requests: cpu: 600m memory: 1G diff --git a/e2e-tests/affinity/compare/statefulset_region-pxc-k127-oc.yml b/e2e-tests/affinity/compare/statefulset_region-pxc-k127-oc.yml index 82403ab36f..75794bcad5 100644 --- a/e2e-tests/affinity/compare/statefulset_region-pxc-k127-oc.yml +++ b/e2e-tests/affinity/compare/statefulset_region-pxc-k127-oc.yml @@ -124,7 +124,7 @@ spec: resources: limits: cpu: "1" - memory: 1G + memory: 2G requests: cpu: 600m memory: 1G diff --git a/e2e-tests/affinity/compare/statefulset_region-pxc-k127.yml b/e2e-tests/affinity/compare/statefulset_region-pxc-k127.yml index d0a7939b90..a7094c015c 100644 --- a/e2e-tests/affinity/compare/statefulset_region-pxc-k127.yml +++ b/e2e-tests/affinity/compare/statefulset_region-pxc-k127.yml @@ -124,7 +124,7 @@ spec: resources: limits: cpu: "1" - memory: 1G + memory: 2G requests: cpu: 600m memory: 1G diff --git a/e2e-tests/affinity/compare/statefulset_zone-pxc-k127-oc.yml b/e2e-tests/affinity/compare/statefulset_zone-pxc-k127-oc.yml index ae3992153b..ab4589a12e 100644 --- a/e2e-tests/affinity/compare/statefulset_zone-pxc-k127-oc.yml +++ b/e2e-tests/affinity/compare/statefulset_zone-pxc-k127-oc.yml @@ -124,7 +124,7 @@ spec: resources: limits: cpu: "1" - memory: 1G + memory: 2G requests: cpu: 600m memory: 1G diff --git a/e2e-tests/affinity/compare/statefulset_zone-pxc-k127.yml b/e2e-tests/affinity/compare/statefulset_zone-pxc-k127.yml index 329fb84064..6c1d0646b6 100644 --- a/e2e-tests/affinity/compare/statefulset_zone-pxc-k127.yml +++ b/e2e-tests/affinity/compare/statefulset_zone-pxc-k127.yml @@ -124,7 +124,7 @@ spec: resources: limits: cpu: "1" - memory: 1G + memory: 2G requests: cpu: 600m memory: 1G diff --git a/e2e-tests/affinity/conf/custom.yml b/e2e-tests/affinity/conf/custom.yml index 23217bc465..b26f17392e 100644 --- a/e2e-tests/affinity/conf/custom.yml +++ b/e2e-tests/affinity/conf/custom.yml @@ -13,7 +13,7 @@ spec: memory: 1G cpu: 600m limits: - memory: "1G" + memory: "2G" cpu: "1" volumeSpec: persistentVolumeClaim: diff --git a/e2e-tests/affinity/conf/hostname.yml b/e2e-tests/affinity/conf/hostname.yml index a62a26aeb5..557b3d20dd 100644 --- a/e2e-tests/affinity/conf/hostname.yml +++ b/e2e-tests/affinity/conf/hostname.yml @@ -13,7 +13,7 @@ spec: memory: 1G cpu: 600m limits: - memory: "1G" + memory: "2G" cpu: "1" volumeSpec: persistentVolumeClaim: diff --git a/e2e-tests/affinity/conf/region.yml b/e2e-tests/affinity/conf/region.yml index 09440c04ca..0a6f7a6998 100644 --- a/e2e-tests/affinity/conf/region.yml +++ b/e2e-tests/affinity/conf/region.yml @@ -10,7 +10,7 @@ spec: image: -pxc resources: requests: - memory: 1G + memory: 2G cpu: 600m limits: memory: "1G" diff --git a/e2e-tests/affinity/conf/zone.yml b/e2e-tests/affinity/conf/zone.yml index f92c2aa51d..5a9bfe21b2 100644 --- a/e2e-tests/affinity/conf/zone.yml +++ b/e2e-tests/affinity/conf/zone.yml @@ -13,7 +13,7 @@ spec: memory: 1G cpu: 600m limits: - memory: "1G" + memory: "2G" cpu: "1" volumeSpec: persistentVolumeClaim: diff --git a/e2e-tests/auto-tuning/conf/auto-tuning-with-limits.yml b/e2e-tests/auto-tuning/conf/auto-tuning-with-limits.yml index 80dcf752a8..38a18f6882 100644 --- a/e2e-tests/auto-tuning/conf/auto-tuning-with-limits.yml +++ b/e2e-tests/auto-tuning/conf/auto-tuning-with-limits.yml @@ -11,7 +11,7 @@ spec: image: -pxc resources: limits: - memory: 1Gi + memory: 2Gi cpu: 1000m volumeSpec: persistentVolumeClaim: diff --git a/e2e-tests/auto-tuning/conf/auto-tuning-with-template-transform.yml b/e2e-tests/auto-tuning/conf/auto-tuning-with-template-transform.yml index 9484353658..760fcc7f38 100644 --- a/e2e-tests/auto-tuning/conf/auto-tuning-with-template-transform.yml +++ b/e2e-tests/auto-tuning/conf/auto-tuning-with-template-transform.yml @@ -15,7 +15,7 @@ spec: image: -pxc resources: limits: - memory: 1Gi + memory: 4Gi requests: memory: 1Gi volumeSpec: diff --git a/e2e-tests/auto-tuning/conf/auto-tuning-with-template.yml b/e2e-tests/auto-tuning/conf/auto-tuning-with-template.yml index db229e521f..9ef4745c2c 100644 --- a/e2e-tests/auto-tuning/conf/auto-tuning-with-template.yml +++ b/e2e-tests/auto-tuning/conf/auto-tuning-with-template.yml @@ -9,7 +9,7 @@ spec: pxc: configuration: | [mysqld] - innodb_buffer_pool_size={{containerMemoryLimit}} + innodb_buffer_pool_size={{containerMemoryLimit * 1 / 2}} max_connections=200 size: 3 image: -pxc @@ -17,7 +17,7 @@ spec: requests: memory: 1Gi limits: - memory: 2Gi + memory: 4Gi volumeSpec: persistentVolumeClaim: resources: diff --git a/e2e-tests/auto-tuning/run b/e2e-tests/auto-tuning/run index 0b4b141dc5..031cb5e0fa 100755 --- a/e2e-tests/auto-tuning/run +++ b/e2e-tests/auto-tuning/run @@ -106,8 +106,8 @@ CONNECTIONS=$(run_mysql \ 'SELECT @@max_connections;' \ "-h $cluster-pxc -uroot -proot_password") -if [[ ${INNODB_SIZE} != 805306368 ]]; then - echo "with-template-transform: innodb_buffer_pool_size ${INNODB_SIZE} should be 805306368" +if [[ ${INNODB_SIZE} != 3221225472 ]]; then + echo "with-template-transform: innodb_buffer_pool_size ${INNODB_SIZE} should be 3221225472" exit 1 fi diff --git a/e2e-tests/conf/some-name.yml b/e2e-tests/conf/some-name.yml index a4448cd7a5..058c8138a1 100644 --- a/e2e-tests/conf/some-name.yml +++ b/e2e-tests/conf/some-name.yml @@ -18,7 +18,7 @@ spec: memory: 0.1G cpu: 100m limits: - memory: "1G" + memory: "2G" cpu: "1" volumeSpec: persistentVolumeClaim: diff --git a/e2e-tests/cross-site/conf/cross-site-replica.yml b/e2e-tests/cross-site/conf/cross-site-replica.yml index 2a1ee73d4e..36d8535d99 100644 --- a/e2e-tests/cross-site/conf/cross-site-replica.yml +++ b/e2e-tests/cross-site/conf/cross-site-replica.yml @@ -29,7 +29,7 @@ spec: memory: 1G cpu: 600m limits: - memory: "1G" + memory: "2G" cpu: "1" volumeSpec: persistentVolumeClaim: diff --git a/e2e-tests/cross-site/conf/cross-site-source.yml b/e2e-tests/cross-site/conf/cross-site-source.yml index f3831f55e0..ddf40103d9 100644 --- a/e2e-tests/cross-site/conf/cross-site-source.yml +++ b/e2e-tests/cross-site/conf/cross-site-source.yml @@ -29,7 +29,7 @@ spec: memory: 1G cpu: 600m limits: - memory: "1G" + memory: "2G" cpu: "1" volumeSpec: persistentVolumeClaim: diff --git a/e2e-tests/demand-backup-cloud/conf/demand-backup-cloud.yml b/e2e-tests/demand-backup-cloud/conf/demand-backup-cloud.yml index f8d97c3d18..7e039016d3 100644 --- a/e2e-tests/demand-backup-cloud/conf/demand-backup-cloud.yml +++ b/e2e-tests/demand-backup-cloud/conf/demand-backup-cloud.yml @@ -27,7 +27,7 @@ spec: memory: 0.1G cpu: 100m limits: - memory: "1G" + memory: "2G" cpu: "1" volumeSpec: persistentVolumeClaim: diff --git a/e2e-tests/demand-backup/conf/demand-backup.yml b/e2e-tests/demand-backup/conf/demand-backup.yml index 4cdc2b7154..3d1584a32b 100644 --- a/e2e-tests/demand-backup/conf/demand-backup.yml +++ b/e2e-tests/demand-backup/conf/demand-backup.yml @@ -30,7 +30,7 @@ spec: memory: 0.1G cpu: 100m limits: - memory: "1G" + memory: "2G" cpu: "1" volumeSpec: persistentVolumeClaim: diff --git a/e2e-tests/functions b/e2e-tests/functions index 72bf29c79d..c140bae86c 100755 --- a/e2e-tests/functions +++ b/e2e-tests/functions @@ -405,6 +405,8 @@ compare_kubectl() { if [[ $IMAGE_PXC =~ 8\.0 ]] && [ -f ${expected_result//.yml/-80.yml} ]; then expected_result=${expected_result//.yml/-80.yml} + elif [[ $IMAGE_PXC =~ 8\.4 ]] && [ -f ${expected_result//.yml/-84.yml} ]; then + expected_result=${expected_result//.yml/-84.yml} fi if version_gt "1.29" && [ -f ${expected_result//.yml/-k129.yml} ]; then @@ -539,6 +541,8 @@ compare_mysql_cmd() { if [[ $IMAGE_PXC =~ 8\.0 ]] && [ -f ${test_dir}/compare/${command_id}${postfix}-80.sql ]; then expected_result=${test_dir}/compare/${command_id}${postfix}-80.sql + elif [[ $IMAGE_PXC =~ 8\.4 ]] && [ -f ${test_dir}/compare/${command_id}${postfix}-84.sql ]; then + expected_result=${test_dir}/compare/${command_id}${postfix}-84.sql fi run_mysql "$command" "$uri" \ @@ -562,6 +566,8 @@ compare_mysql_cmd_local() { if [[ $IMAGE_PXC =~ 8\.0 ]] && [ -f ${test_dir}/compare/${command_id}${postfix}-80.sql ]; then expected_result=${test_dir}/compare/${command_id}${postfix}-80.sql + elif [[ $IMAGE_PXC =~ 8\.4 ]] && [ -f ${test_dir}/compare/${command_id}${postfix}-84.sql ]; then + expected_result=${test_dir}/compare/${command_id}${postfix}-84.sql fi run_mysql_local "$command" "$uri" "$pod" "$container_name" \ @@ -605,6 +611,8 @@ compare_mysql_user() { if [[ $IMAGE_PXC =~ 8\.0 ]] && [ -f ${test_dir}/compare/$user$postfix-80.sql ]; then expected_result=${test_dir}/compare/$user$postfix-80.sql + elif [[ $IMAGE_PXC =~ 8\.4 ]] && [ -f ${test_dir}/compare/$user$postfix-84.sql ]; then + expected_result=${test_dir}/compare/$user$postfix-84.sql fi (run_mysql "SHOW GRANTS;" "$uri" || :) \ @@ -623,6 +631,8 @@ compare_mysql_user_local() { if [[ $IMAGE_PXC =~ 8\.0 ]] && [ -f ${test_dir}/compare/$user$postfix-80.sql ]; then expected_result=${test_dir}/compare/$user$postfix-80.sql + elif [[ $IMAGE_PXC =~ 8\.4 ]] && [ -f ${test_dir}/compare/$user$postfix-84.sql ]; then + expected_result=${test_dir}/compare/$user$postfix-84.sql fi (run_mysql_local "SHOW GRANTS;" "$uri" "$pod" "$container_name" || :) \ diff --git a/e2e-tests/haproxy/conf/haproxy.yml b/e2e-tests/haproxy/conf/haproxy.yml index f7b330ebbc..df75e4ebc0 100644 --- a/e2e-tests/haproxy/conf/haproxy.yml +++ b/e2e-tests/haproxy/conf/haproxy.yml @@ -24,7 +24,7 @@ spec: memory: 0.1G cpu: 100m limits: - memory: "1G" + memory: "2G" cpu: "1" volumeSpec: persistentVolumeClaim: diff --git a/e2e-tests/init-deploy/compare/max_allowed_packet-1-84.sql b/e2e-tests/init-deploy/compare/max_allowed_packet-1-84.sql new file mode 100644 index 0000000000..e6c68622ac --- /dev/null +++ b/e2e-tests/init-deploy/compare/max_allowed_packet-1-84.sql @@ -0,0 +1 @@ +67108864 diff --git a/e2e-tests/init-deploy/compare/monitor-84.sql b/e2e-tests/init-deploy/compare/monitor-84.sql new file mode 100644 index 0000000000..2a8c724ee0 --- /dev/null +++ b/e2e-tests/init-deploy/compare/monitor-84.sql @@ -0,0 +1,3 @@ +GRANT SELECT, RELOAD, PROCESS, SUPER, REPLICATION CLIENT ON *.* TO `monitor`@`%` +GRANT SERVICE_CONNECTION_ADMIN,SYSTEM_USER ON *.* TO `monitor`@`%` +GRANT SELECT ON `performance_schema`.* TO `monitor`@`%` diff --git a/e2e-tests/init-deploy/compare/root-84.sql b/e2e-tests/init-deploy/compare/root-84.sql new file mode 100644 index 0000000000..9fbcaf9dea --- /dev/null +++ b/e2e-tests/init-deploy/compare/root-84.sql @@ -0,0 +1,2 @@ +GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `root`@`%` WITH GRANT OPTION +GRANT ALLOW_NONEXISTENT_DEFINER,APPLICATION_PASSWORD_ADMIN,AUDIT_ABORT_EXEMPT,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FIREWALL_EXEMPT,FLUSH_OPTIMIZER_COSTS,FLUSH_PRIVILEGES,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,OPTIMIZE_LOCAL_TABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SENSITIVE_VARIABLES_OBSERVER,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_ANY_DEFINER,SHOW_ROUTINE,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,TELEMETRY_LOG_ADMIN,TRANSACTION_GTID_TAG,XA_RECOVER_ADMIN ON *.* TO `root`@`%` WITH GRANT OPTION diff --git a/e2e-tests/init-deploy/compare/statefulset_some-name-pxc-k127-oc.yml b/e2e-tests/init-deploy/compare/statefulset_some-name-pxc-k127-oc.yml index 6910beac9a..74afea6fad 100644 --- a/e2e-tests/init-deploy/compare/statefulset_some-name-pxc-k127-oc.yml +++ b/e2e-tests/init-deploy/compare/statefulset_some-name-pxc-k127-oc.yml @@ -171,7 +171,7 @@ spec: resources: limits: cpu: "1" - memory: 1G + memory: 2G requests: cpu: 100m memory: 100M diff --git a/e2e-tests/init-deploy/compare/statefulset_some-name-pxc-k127.yml b/e2e-tests/init-deploy/compare/statefulset_some-name-pxc-k127.yml index f8c7f90556..3f2ce0adb5 100644 --- a/e2e-tests/init-deploy/compare/statefulset_some-name-pxc-k127.yml +++ b/e2e-tests/init-deploy/compare/statefulset_some-name-pxc-k127.yml @@ -171,7 +171,7 @@ spec: resources: limits: cpu: "1" - memory: 1G + memory: 2G requests: cpu: 100m memory: 100M diff --git a/e2e-tests/init-deploy/compare/xtrabackup-84.sql b/e2e-tests/init-deploy/compare/xtrabackup-84.sql new file mode 100644 index 0000000000..4f27afeec7 --- /dev/null +++ b/e2e-tests/init-deploy/compare/xtrabackup-84.sql @@ -0,0 +1,2 @@ +GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `xtrabackup`@`%` WITH GRANT OPTION +GRANT ALLOW_NONEXISTENT_DEFINER,APPLICATION_PASSWORD_ADMIN,AUDIT_ABORT_EXEMPT,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FIREWALL_EXEMPT,FLUSH_OPTIMIZER_COSTS,FLUSH_PRIVILEGES,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,OPTIMIZE_LOCAL_TABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SENSITIVE_VARIABLES_OBSERVER,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_ANY_DEFINER,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,TELEMETRY_LOG_ADMIN,TRANSACTION_GTID_TAG,XA_RECOVER_ADMIN ON *.* TO `xtrabackup`@`%` WITH GRANT OPTION diff --git a/e2e-tests/limits/compare/statefulset_no-requests-pxc-increased-k127-oc.yml b/e2e-tests/limits/compare/statefulset_no-requests-pxc-increased-k127-oc.yml index 805d144969..171a4bcdcb 100644 --- a/e2e-tests/limits/compare/statefulset_no-requests-pxc-increased-k127-oc.yml +++ b/e2e-tests/limits/compare/statefulset_no-requests-pxc-increased-k127-oc.yml @@ -113,7 +113,7 @@ spec: resources: limits: cpu: 600m - memory: 1G + memory: 2G terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/limits/compare/statefulset_no-requests-pxc-increased-k127.yml b/e2e-tests/limits/compare/statefulset_no-requests-pxc-increased-k127.yml index 28dadd0e1d..07dcbd0391 100644 --- a/e2e-tests/limits/compare/statefulset_no-requests-pxc-increased-k127.yml +++ b/e2e-tests/limits/compare/statefulset_no-requests-pxc-increased-k127.yml @@ -113,7 +113,7 @@ spec: resources: limits: cpu: 600m - memory: 1G + memory: 2G terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/limits/compare/statefulset_no-requests-pxc-k127-oc.yml b/e2e-tests/limits/compare/statefulset_no-requests-pxc-k127-oc.yml index 3be6536ace..e7689a8b35 100644 --- a/e2e-tests/limits/compare/statefulset_no-requests-pxc-k127-oc.yml +++ b/e2e-tests/limits/compare/statefulset_no-requests-pxc-k127-oc.yml @@ -113,7 +113,7 @@ spec: resources: limits: cpu: 300m - memory: 600M + memory: 2G terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/limits/compare/statefulset_no-requests-pxc-k127.yml b/e2e-tests/limits/compare/statefulset_no-requests-pxc-k127.yml index 4d81b7835f..0da948d909 100644 --- a/e2e-tests/limits/compare/statefulset_no-requests-pxc-k127.yml +++ b/e2e-tests/limits/compare/statefulset_no-requests-pxc-k127.yml @@ -113,7 +113,7 @@ spec: resources: limits: cpu: 300m - memory: 600M + memory: 2G terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/limits/conf/no-requests.yml b/e2e-tests/limits/conf/no-requests.yml index 6b591a5c0a..5049dd65f2 100644 --- a/e2e-tests/limits/conf/no-requests.yml +++ b/e2e-tests/limits/conf/no-requests.yml @@ -11,7 +11,7 @@ spec: image: -pxc resources: limits: - memory: 600M + memory: 2G cpu: 300m volumeSpec: persistentVolumeClaim: diff --git a/e2e-tests/pitr-gap-errors/conf/pitr-gap-errors.yml b/e2e-tests/pitr-gap-errors/conf/pitr-gap-errors.yml index 830b9aea17..213751aed3 100755 --- a/e2e-tests/pitr-gap-errors/conf/pitr-gap-errors.yml +++ b/e2e-tests/pitr-gap-errors/conf/pitr-gap-errors.yml @@ -23,7 +23,7 @@ spec: memory: 0.1G cpu: 100m limits: - memory: "1G" + memory: "2G" cpu: "1" volumeSpec: persistentVolumeClaim: diff --git a/e2e-tests/pitr/conf/pitr.yml b/e2e-tests/pitr/conf/pitr.yml index fbced6e1f8..41ef4dbf7c 100755 --- a/e2e-tests/pitr/conf/pitr.yml +++ b/e2e-tests/pitr/conf/pitr.yml @@ -23,7 +23,7 @@ spec: memory: 0.1G cpu: 100m limits: - memory: "1G" + memory: "2G" cpu: "1" volumeSpec: persistentVolumeClaim: diff --git a/e2e-tests/proxysql-sidecar-res-limits/conf/side-car.yml b/e2e-tests/proxysql-sidecar-res-limits/conf/side-car.yml index d0ea625f8e..244d328d2e 100644 --- a/e2e-tests/proxysql-sidecar-res-limits/conf/side-car.yml +++ b/e2e-tests/proxysql-sidecar-res-limits/conf/side-car.yml @@ -16,7 +16,7 @@ spec: memory: 0.1G cpu: 100m limits: - memory: "1G" + memory: "2G" cpu: "1" volumeSpec: persistentVolumeClaim: diff --git a/e2e-tests/pvc-resize/conf/some-name-eks.yml b/e2e-tests/pvc-resize/conf/some-name-eks.yml index a07a187383..be33e3b2cf 100644 --- a/e2e-tests/pvc-resize/conf/some-name-eks.yml +++ b/e2e-tests/pvc-resize/conf/some-name-eks.yml @@ -19,7 +19,7 @@ spec: memory: 0.1G cpu: 100m limits: - memory: "1G" + memory: "2G" cpu: "1" volumeSpec: persistentVolumeClaim: diff --git a/e2e-tests/pvc-resize/conf/some-name.yml b/e2e-tests/pvc-resize/conf/some-name.yml index bada501d4c..84f824d5a0 100644 --- a/e2e-tests/pvc-resize/conf/some-name.yml +++ b/e2e-tests/pvc-resize/conf/some-name.yml @@ -18,7 +18,7 @@ spec: memory: 0.1G cpu: 100m limits: - memory: "1G" + memory: "2G" cpu: "1" volumeSpec: persistentVolumeClaim: diff --git a/e2e-tests/security-context/compare/statefulset_sec-context-pxc-changes-k127.yml b/e2e-tests/security-context/compare/statefulset_sec-context-pxc-changes-k127.yml index fb3998f9a4..adba4dbb2c 100644 --- a/e2e-tests/security-context/compare/statefulset_sec-context-pxc-changes-k127.yml +++ b/e2e-tests/security-context/compare/statefulset_sec-context-pxc-changes-k127.yml @@ -126,7 +126,7 @@ spec: resources: limits: cpu: "1" - memory: 1G + memory: 2G requests: cpu: 100m memory: 100M diff --git a/e2e-tests/security-context/compare/statefulset_sec-context-pxc-k127.yml b/e2e-tests/security-context/compare/statefulset_sec-context-pxc-k127.yml index 901488f0d4..87cfc096e0 100644 --- a/e2e-tests/security-context/compare/statefulset_sec-context-pxc-k127.yml +++ b/e2e-tests/security-context/compare/statefulset_sec-context-pxc-k127.yml @@ -126,7 +126,7 @@ spec: resources: limits: cpu: "1" - memory: 1G + memory: 2G requests: cpu: 100m memory: 100M diff --git a/e2e-tests/security-context/conf/sec-context-changes.yml b/e2e-tests/security-context/conf/sec-context-changes.yml index ff904c9f3c..ac4d66a9af 100644 --- a/e2e-tests/security-context/conf/sec-context-changes.yml +++ b/e2e-tests/security-context/conf/sec-context-changes.yml @@ -29,7 +29,7 @@ spec: memory: 0.1G cpu: 100m limits: - memory: "1G" + memory: "2G" cpu: "1" volumeSpec: persistentVolumeClaim: diff --git a/e2e-tests/security-context/conf/sec-context.yml b/e2e-tests/security-context/conf/sec-context.yml index 9167c0b287..f5ee878322 100644 --- a/e2e-tests/security-context/conf/sec-context.yml +++ b/e2e-tests/security-context/conf/sec-context.yml @@ -24,7 +24,7 @@ spec: memory: 0.1G cpu: 100m limits: - memory: "1G" + memory: "2G" cpu: "1" volumeSpec: persistentVolumeClaim: diff --git a/e2e-tests/tls-issue-cert-manager/conf/some-name-tls-issue-haproxy.yml b/e2e-tests/tls-issue-cert-manager/conf/some-name-tls-issue-haproxy.yml index b258645407..6df30dd9a7 100644 --- a/e2e-tests/tls-issue-cert-manager/conf/some-name-tls-issue-haproxy.yml +++ b/e2e-tests/tls-issue-cert-manager/conf/some-name-tls-issue-haproxy.yml @@ -19,7 +19,7 @@ spec: memory: 0.1G cpu: 100m limits: - memory: "1G" + memory: "2G" cpu: "1" volumeSpec: persistentVolumeClaim: diff --git a/e2e-tests/tls-issue-cert-manager/conf/some-name-tls-issue.yml b/e2e-tests/tls-issue-cert-manager/conf/some-name-tls-issue.yml index 84700992ea..1f05d871d6 100644 --- a/e2e-tests/tls-issue-cert-manager/conf/some-name-tls-issue.yml +++ b/e2e-tests/tls-issue-cert-manager/conf/some-name-tls-issue.yml @@ -19,7 +19,7 @@ spec: memory: 0.1G cpu: 100m limits: - memory: "1G" + memory: "2G" cpu: "1" volumeSpec: persistentVolumeClaim: diff --git a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1140-k127-oc.yml b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1140-k127-oc.yml index d775f78770..1d045b704a 100644 --- a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1140-k127-oc.yml +++ b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1140-k127-oc.yml @@ -171,7 +171,7 @@ spec: resources: limits: cpu: "1" - memory: 1G + memory: 2G requests: cpu: 100m memory: 100M diff --git a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1140-k127.yml b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1140-k127.yml index 1449ca31f0..47f50b57f0 100644 --- a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1140-k127.yml +++ b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1140-k127.yml @@ -171,7 +171,7 @@ spec: resources: limits: cpu: "1" - memory: 1G + memory: 2G requests: cpu: 100m memory: 100M diff --git a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1150-k127-oc.yml b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1150-k127-oc.yml index 9f269576f7..ceda57c5c2 100644 --- a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1150-k127-oc.yml +++ b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1150-k127-oc.yml @@ -171,7 +171,7 @@ spec: resources: limits: cpu: "1" - memory: 1G + memory: 2G requests: cpu: 100m memory: 100M diff --git a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1150-k127.yml b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1150-k127.yml index d00b0abed2..35860b406e 100644 --- a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1150-k127.yml +++ b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1150-k127.yml @@ -171,7 +171,7 @@ spec: resources: limits: cpu: "1" - memory: 1G + memory: 2G requests: cpu: 100m memory: 100M diff --git a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1160-k127-oc.yml b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1160-k127-oc.yml index 9f269576f7..ceda57c5c2 100644 --- a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1160-k127-oc.yml +++ b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1160-k127-oc.yml @@ -171,7 +171,7 @@ spec: resources: limits: cpu: "1" - memory: 1G + memory: 2G requests: cpu: 100m memory: 100M diff --git a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1160-k127.yml b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1160-k127.yml index 26aa2521fa..9b1296fba1 100644 --- a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1160-k127.yml +++ b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1160-k127.yml @@ -171,7 +171,7 @@ spec: resources: limits: cpu: "1" - memory: 1G + memory: 2G requests: cpu: 100m memory: 100M diff --git a/e2e-tests/users/conf/some-name.yml b/e2e-tests/users/conf/some-name.yml index ce30c6c6b7..76798b8ccd 100644 --- a/e2e-tests/users/conf/some-name.yml +++ b/e2e-tests/users/conf/some-name.yml @@ -16,7 +16,7 @@ spec: memory: 0.1G cpu: 100m limits: - memory: "1G" + memory: "2G" cpu: "1" volumeSpec: persistentVolumeClaim: From 3e1c080348223ad68452ab4c562c979ed1a37425 Mon Sep 17 00:00:00 2001 From: Viacheslav Sarzhan Date: Fri, 22 Nov 2024 10:02:05 +0200 Subject: [PATCH 2/5] K8SPXC-1410 fix several tests --- e2e-tests/affinity/conf/region.yml | 4 ++-- e2e-tests/scaling-proxysql/conf/scaling-proxysql.yml | 2 +- .../conf/some-name-tls-issueref.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/e2e-tests/affinity/conf/region.yml b/e2e-tests/affinity/conf/region.yml index 0a6f7a6998..e81d6d10f4 100644 --- a/e2e-tests/affinity/conf/region.yml +++ b/e2e-tests/affinity/conf/region.yml @@ -10,10 +10,10 @@ spec: image: -pxc resources: requests: - memory: 2G + memory: 1G cpu: 600m limits: - memory: "1G" + memory: "2G" cpu: "1" volumeSpec: persistentVolumeClaim: diff --git a/e2e-tests/scaling-proxysql/conf/scaling-proxysql.yml b/e2e-tests/scaling-proxysql/conf/scaling-proxysql.yml index 864e8fccc5..d9e037b36d 100644 --- a/e2e-tests/scaling-proxysql/conf/scaling-proxysql.yml +++ b/e2e-tests/scaling-proxysql/conf/scaling-proxysql.yml @@ -15,7 +15,7 @@ spec: memory: 0.1G cpu: 100m limits: - memory: "1G" + memory: "2G" cpu: "1" volumeSpec: persistentVolumeClaim: diff --git a/e2e-tests/tls-issue-cert-manager-ref/conf/some-name-tls-issueref.yml b/e2e-tests/tls-issue-cert-manager-ref/conf/some-name-tls-issueref.yml index ea1d1531e1..ad121ef4ea 100644 --- a/e2e-tests/tls-issue-cert-manager-ref/conf/some-name-tls-issueref.yml +++ b/e2e-tests/tls-issue-cert-manager-ref/conf/some-name-tls-issueref.yml @@ -22,7 +22,7 @@ spec: memory: 0.1G cpu: 100m limits: - memory: "1G" + memory: "2G" cpu: "1" volumeSpec: persistentVolumeClaim: From 160ad63d7fc7a97ad0c273af998ce880b2e4e34c Mon Sep 17 00:00:00 2001 From: Viacheslav Sarzhan Date: Sat, 23 Nov 2024 22:13:18 +0200 Subject: [PATCH 3/5] fix big-data test --- build/pxc-entrypoint.sh | 2 +- e2e-tests/big-data/conf/restore-backup-84.yml | 12 ++++++++++++ e2e-tests/big-data/run | 4 +++- 3 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 e2e-tests/big-data/conf/restore-backup-84.yml diff --git a/build/pxc-entrypoint.sh b/build/pxc-entrypoint.sh index 8f9f84a37b..89a8d73d1c 100755 --- a/build/pxc-entrypoint.sh +++ b/build/pxc-entrypoint.sh @@ -190,7 +190,7 @@ grep -q "^progress=" $CFG && sed -i "s|^progress=.*|progress=1|" $CFG grep -q "^\[sst\]" "$CFG" || printf '[sst]\n' >>"$CFG" grep -q "^cpat=" "$CFG" || sed '/^\[sst\]/a cpat=.*\\.pem$\\|.*init\\.ok$\\|.*galera\\.cache$\\|.*wsrep_recovery_verbose\\.log$\\|.*readiness-check\\.sh$\\|.*liveness-check\\.sh$\\|.*get-pxc-state$\\|.*sst_in_progress$\\|.*sleep-forever$\\|.*pmm-prerun\\.sh$\\|.*sst-xb-tmpdir$\\|.*\\.sst$\\|.*gvwstate\\.dat$\\|.*grastate\\.dat$\\|.*\\.err$\\|.*\\.log$\\|.*RPM_UPGRADE_MARKER$\\|.*RPM_UPGRADE_HISTORY$\\|.*pxc-entrypoint\\.sh$\\|.*unsafe-bootstrap\\.sh$\\|.*pxc-configure-pxc\\.sh\\|.*peer-list$\\|.*auth_plugin$\\|.*version_info$\\|.*mysql-state-monitor$\\|.*mysql-state-monitor\\.log$\\|.*notify\\.sock$\\|.*mysql\\.state$' "$CFG" 1<>"$CFG" -if [[ $MYSQL_VERSION == '8.0' && $MYSQL_PATCH_VERSION -ge 26]] || [[ $MYSQL_VERSION == "8.4" ]]; then +if [[ $MYSQL_VERSION == '8.0' && $MYSQL_PATCH_VERSION -ge 26 ]] || [[ $MYSQL_VERSION == '8.4' ]]; then grep -q "^skip_replica_start=ON" "$CFG" || sed -i "/\[mysqld\]/a skip_replica_start=ON" $CFG else grep -q "^skip_slave_start=ON" "$CFG" || sed -i "/\[mysqld\]/a skip_slave_start=ON" $CFG diff --git a/e2e-tests/big-data/conf/restore-backup-84.yml b/e2e-tests/big-data/conf/restore-backup-84.yml new file mode 100644 index 0000000000..7b7566fc89 --- /dev/null +++ b/e2e-tests/big-data/conf/restore-backup-84.yml @@ -0,0 +1,12 @@ +apiVersion: pxc.percona.com/v1 +kind: PerconaXtraDBClusterRestore +metadata: + name: restore1 +spec: + pxcCluster: some-name + backupSource: + destination: s3://percona-jenkins-artifactory/big-data-test/some-name-2024-11-23-19:32:52-full + s3: + credentialsSecret: aws-s3-secret + region: us-east-1 + endpointUrl: https://s3.amazonaws.com diff --git a/e2e-tests/big-data/run b/e2e-tests/big-data/run index 4b73f5f405..d4b556dd3d 100755 --- a/e2e-tests/big-data/run +++ b/e2e-tests/big-data/run @@ -19,10 +19,12 @@ main() { desc 'create first PXC cluster' cluster="some-name" spinup_pxc "$cluster" "$test_dir/conf/$cluster.yml" "3" "10" "$test_dir/conf/secrets_without_tls.yml" - if [[ $IMAGE_PXC =~ 8\.0 ]]; then desc 'Switch to 8.0 backup' kubectl_bin apply -f "${test_dir}/conf/restore-backup.yml" + elif [[ $IMAGE_PXC =~ 8\.4 ]]; then + desc 'Switch to 8.4 backup' + kubectl_bin apply -f "${test_dir}/conf/restore-backup-84.yml" else kubectl_bin apply -f "${test_dir}/conf/restore-backup-57.yml" fi From 86068cee70203aef064a20f175f1d7c3c899ddf4 Mon Sep 17 00:00:00 2001 From: Viacheslav Sarzhan Date: Sun, 24 Nov 2024 14:42:38 +0200 Subject: [PATCH 4/5] fix users test --- e2e-tests/users/compare/select-4-84.sql | 87 +++++++++++++++++++++++++ 1 file changed, 87 insertions(+) create mode 100644 e2e-tests/users/compare/select-4-84.sql diff --git a/e2e-tests/users/compare/select-4-84.sql b/e2e-tests/users/compare/select-4-84.sql new file mode 100644 index 0000000000..d9695b3c54 --- /dev/null +++ b/e2e-tests/users/compare/select-4-84.sql @@ -0,0 +1,87 @@ +ADMINISTRABLE_ROLE_AUTHORIZATIONS +APPLICABLE_ROLES +CHARACTER_SETS +CHECK_CONSTRAINTS +CLIENT_STATISTICS +COLLATIONS +COLLATION_CHARACTER_SET_APPLICABILITY +COLUMNS +COLUMNS_EXTENSIONS +COLUMN_PRIVILEGES +COLUMN_STATISTICS +COMPRESSION_DICTIONARY +COMPRESSION_DICTIONARY_TABLES +ENABLED_ROLES +ENGINES +EVENTS +FILES +GLOBAL_TEMPORARY_TABLES +INDEX_STATISTICS +INNODB_BUFFER_PAGE +INNODB_BUFFER_PAGE_LRU +INNODB_BUFFER_POOL_STATS +INNODB_CACHED_INDEXES +INNODB_CMP +INNODB_CMPMEM +INNODB_CMPMEM_RESET +INNODB_CMP_PER_INDEX +INNODB_CMP_PER_INDEX_RESET +INNODB_CMP_RESET +INNODB_COLUMNS +INNODB_DATAFILES +INNODB_FIELDS +INNODB_FOREIGN +INNODB_FOREIGN_COLS +INNODB_FT_BEING_DELETED +INNODB_FT_CONFIG +INNODB_FT_DEFAULT_STOPWORD +INNODB_FT_DELETED +INNODB_FT_INDEX_CACHE +INNODB_FT_INDEX_TABLE +INNODB_INDEXES +INNODB_METRICS +INNODB_SESSION_TEMP_TABLESPACES +INNODB_TABLES +INNODB_TABLESPACES +INNODB_TABLESPACES_BRIEF +INNODB_TABLESTATS +INNODB_TEMP_TABLE_INFO +INNODB_TRX +INNODB_VIRTUAL +KEYWORDS +KEY_COLUMN_USAGE +OPTIMIZER_TRACE +PARAMETERS +PARTITIONS +PLUGINS +PROCESSLIST +PROFILING +REFERENTIAL_CONSTRAINTS +RESOURCE_GROUPS +ROLE_COLUMN_GRANTS +ROLE_ROUTINE_GRANTS +ROLE_TABLE_GRANTS +ROUTINES +SCHEMATA +SCHEMATA_EXTENSIONS +SCHEMA_PRIVILEGES +STATISTICS +ST_GEOMETRY_COLUMNS +ST_SPATIAL_REFERENCE_SYSTEMS +ST_UNITS_OF_MEASURE +TABLES +TABLESPACES_EXTENSIONS +TABLES_EXTENSIONS +TABLE_CONSTRAINTS +TABLE_CONSTRAINTS_EXTENSIONS +TABLE_PRIVILEGES +TABLE_STATISTICS +TEMPORARY_TABLES +THREAD_STATISTICS +TRIGGERS +USER_ATTRIBUTES +USER_PRIVILEGES +USER_STATISTICS +VIEWS +VIEW_ROUTINE_USAGE +VIEW_TABLE_USAGE From 5b82e85175db0937ad50e7118ef16092f943346e Mon Sep 17 00:00:00 2001 From: Viacheslav Sarzhan Date: Sun, 24 Nov 2024 15:20:13 +0200 Subject: [PATCH 5/5] fix init deployment test --- build/pxc-entrypoint.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/build/pxc-entrypoint.sh b/build/pxc-entrypoint.sh index 89a8d73d1c..afb0d73436 100755 --- a/build/pxc-entrypoint.sh +++ b/build/pxc-entrypoint.sh @@ -292,8 +292,7 @@ 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' ]]; 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 & fi @@ -521,7 +520,7 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then fi set -x - if [[ ${MYSQL_VERSION} == '8.0' ]]; then + if [[ "$MYSQL_VERSION" =~ ^(8\.0|8\.4)$ ]]; then mysqlState="startup" while [[ "${mysqlState}" != "ready" ]]; do mysqlState=$(tr -d '\0' < ${MYSQL_STATE_FILE})