From a4aa43bfcc1679be655e04db70323cd2a1527f31 Mon Sep 17 00:00:00 2001 From: Viacheslav Sarzhan Date: Thu, 23 Nov 2023 14:23:38 +0200 Subject: [PATCH] K8SPXC-200 custom options should have more priority than default --- percona-xtradb-cluster-5.7-backup/backup.sh | 12 ++++++------ .../recovery-cloud.sh | 16 ++++++++-------- .../recovery-pvc-joiner.sh | 10 +++++----- .../lib/pxc/backup.sh | 2 +- .../recovery-cloud.sh | 14 +++++++------- .../recovery-pvc-joiner.sh | 8 ++++---- percona-xtradb-cluster-8.0-backup/run_backup.sh | 8 ++++---- 7 files changed, 35 insertions(+), 35 deletions(-) diff --git a/percona-xtradb-cluster-5.7-backup/backup.sh b/percona-xtradb-cluster-5.7-backup/backup.sh index 5f9271d2..c62de825 100755 --- a/percona-xtradb-cluster-5.7-backup/backup.sh +++ b/percona-xtradb-cluster-5.7-backup/backup.sh @@ -169,11 +169,11 @@ backup_s3() { fi vault_store /tmp/${SST_INFO_NAME} xbstream -C /tmp -c ${SST_INFO_NAME} $XBSTREAM_EXTRA_ARGS \ - | xbcloud put ${INSECURE_ARG} $XBCLOUD_EXTRA_ARGS --storage=s3 --parallel="$(grep -c processor /proc/cpuinfo)" --md5 --s3-bucket="$S3_BUCKET" "$S3_BUCKET_PATH.$SST_INFO_NAME" 2>&1 \ + | xbcloud put ${INSECURE_ARG} --storage=s3 --parallel="$(grep -c processor /proc/cpuinfo)" --md5 $XBCLOUD_EXTRA_ARGS --s3-bucket="$S3_BUCKET" "$S3_BUCKET_PATH.$SST_INFO_NAME" 2>&1 \ | (grep -v "error: http request failed: Couldn't resolve host name" || exit 1) socat -u "$SOCAT_OPTS" stdio \ - | xbcloud put ${INSECURE_ARG} $XBCLOUD_EXTRA_ARGS --storage=s3 --parallel="$(grep -c processor /proc/cpuinfo)" --md5 --s3-bucket="$S3_BUCKET" "$S3_BUCKET_PATH" 2>&1 \ + | xbcloud put ${INSECURE_ARG} --storage=s3 --parallel="$(grep -c processor /proc/cpuinfo)" --md5 $XBCLOUD_EXTRA_ARGS --s3-bucket="$S3_BUCKET" "$S3_BUCKET_PATH" 2>&1 \ | (grep -v "error: http request failed: Couldn't resolve host name" || exit 1) mc -C /tmp/mc ${INSECURE_ARG} stat "dest/$S3_BUCKET/$S3_BUCKET_PATH.md5" @@ -228,8 +228,8 @@ backup_azure() { echo "[INFO] Backup to $ENDPOINT/$AZURE_CONTAINER_NAME/$BACKUP_PATH" - is_object_exist_azure "$BACKUP_PATH.$SST_INFO_NAME/" || xbcloud delete $XBCLOUD_EXTRA_ARGS ${INSECURE_ARG} --storage=azure "$BACKUP_PATH.$SST_INFO_NAME" - is_object_exist_azure "$BACKUP_PATH/" || xbcloud delete $XBCLOUD_EXTRA_ARGS ${INSECURE_ARG} --storage=azure "$BACKUP_PATH" + is_object_exist_azure "$BACKUP_PATH.$SST_INFO_NAME/" || xbcloud delete ${INSECURE_ARG} $XBCLOUD_EXTRA_ARGS --storage=azure "$BACKUP_PATH.$SST_INFO_NAME" + is_object_exist_azure "$BACKUP_PATH/" || xbcloud delete ${INSECURE_ARG} $XBCLOUD_EXTRA_ARGS --storage=azure "$BACKUP_PATH" request_streaming socat -u "$SOCAT_OPTS" stdio | xbstream -x -C /tmp $XBSTREAM_EXTRA_ARGS @@ -240,11 +240,11 @@ backup_azure() { vault_store /tmp/${SST_INFO_NAME} xbstream -C /tmp -c ${SST_INFO_NAME} $XBSTREAM_EXTRA_ARGS \ - | xbcloud put $XBCLOUD_EXTRA_ARGS ${INSECURE_ARG} --storage=azure --parallel="$(grep -c processor /proc/cpuinfo)" "$BACKUP_PATH.$SST_INFO_NAME" 2>&1 \ + | xbcloud put ${INSECURE_ARG} --storage=azure --parallel="$(grep -c processor /proc/cpuinfo)" $XBCLOUD_EXTRA_ARGS "$BACKUP_PATH.$SST_INFO_NAME" 2>&1 \ | (grep -v "error: http request failed: Couldn't resolve host name" || exit 1) socat -u "$SOCAT_OPTS" stdio \ - | xbcloud put $XBCLOUD_EXTRA_ARGS ${INSECURE_ARG} --storage=azure --parallel="$(grep -c processor /proc/cpuinfo)" "$BACKUP_PATH" 2>&1 \ + | xbcloud put ${INSECURE_ARG} --storage=azure --parallel="$(grep -c processor /proc/cpuinfo)" $XBCLOUD_EXTRA_ARGS "$BACKUP_PATH" 2>&1 \ | (grep -v "error: http request failed: Couldn't resolve host name" || exit 1) echo '[INFO] Backup was finished successfully' } diff --git a/percona-xtradb-cluster-5.7-backup/recovery-cloud.sh b/percona-xtradb-cluster-5.7-backup/recovery-cloud.sh index dc0d4090..52de5fda 100755 --- a/percona-xtradb-cluster-5.7-backup/recovery-cloud.sh +++ b/percona-xtradb-cluster-5.7-backup/recovery-cloud.sh @@ -11,7 +11,7 @@ MC_ARGS='-C /tmp/mc' XBCLOUD_ARGS="$XBCLOUD_EXTRA_ARGS" if [ -n "$VERIFY_TLS" ] && [[ $VERIFY_TLS == "false" ]]; then - XBCLOUD_ARGS="--insecure" + XBCLOUD_ARGS="--insecure ${XBCLOUD_ARGS}" MC_ARGS="${MC_ARGS} --insecure" fi @@ -40,8 +40,8 @@ destination() { fi } -xbcloud get ${XBCLOUD_ARGS} "$(destination).sst_info" --parallel="$(grep -c processor /proc/cpuinfo)" | xbstream -x -C "${tmp}" --parallel="$(grep -c processor /proc/cpuinfo)" $XBSTREAM_EXTRA_ARGS -xbcloud get ${XBCLOUD_ARGS} "$(destination)" --parallel="$(grep -c processor /proc/cpuinfo)" | xbstream -x -C "${tmp}" --parallel="$(grep -c processor /proc/cpuinfo)" $XBSTREAM_EXTRA_ARGS +xbcloud get --parallel="$(grep -c processor /proc/cpuinfo)" ${XBCLOUD_ARGS} "$(destination).sst_info" | xbstream -x -C "${tmp}" --parallel="$(grep -c processor /proc/cpuinfo)" $XBSTREAM_EXTRA_ARGS +xbcloud get --parallel="$(grep -c processor /proc/cpuinfo)" ${XBCLOUD_ARGS} "$(destination)" | xbstream -x -C "${tmp}" --parallel="$(grep -c processor /proc/cpuinfo)" $XBSTREAM_EXTRA_ARGS set +o xtrace transition_key=$(vault_get "$tmp/sst_info") @@ -57,19 +57,19 @@ if [[ -n $transition_key && $transition_key != null ]]; then echo transition-key exists fi -echo "+ xtrabackup ${XB_EXTRA_ARGS} ${XB_USE_MEMORY+--use-memory=$XB_USE_MEMORY} --prepare --binlog-info=ON --rollback-prepared-trx \ +echo "+ xtrabackup ${XB_USE_MEMORY+--use-memory=$XB_USE_MEMORY} --prepare ${XB_EXTRA_ARGS} --binlog-info=ON --rollback-prepared-trx \ --xtrabackup-plugin-dir=/usr/lib64/xtrabackup/plugin --target-dir=$tmp" -innobackupex ${XB_USE_MEMORY+--use-memory=$XB_USE_MEMORY} --parallel="$(grep -c processor /proc/cpuinfo)" --decompress "$tmp" -xtrabackup ${XB_EXTRA_ARGS} ${XB_USE_MEMORY+--use-memory=$XB_USE_MEMORY} --prepare --binlog-info=ON $transition_option --rollback-prepared-trx \ +innobackupex ${XB_USE_MEMORY+--use-memory=$XB_USE_MEMORY} --parallel="$(grep -c processor /proc/cpuinfo)" ${XB_EXTRA_ARGS} --decompress "$tmp" +xtrabackup ${XB_USE_MEMORY+--use-memory=$XB_USE_MEMORY} --prepare ${XB_EXTRA_ARGS} --binlog-info=ON $transition_option --rollback-prepared-trx \ --xtrabackup-plugin-dir=/usr/lib64/xtrabackup/plugin "--target-dir=$tmp" -echo "+ xtrabackup ${XB_EXTRA_ARGS} --defaults-group=mysqld --datadir=/datadir --move-back --binlog-info=ON \ +echo "+ xtrabackup --defaults-group=mysqld --datadir=/datadir --move-back ${XB_EXTRA_ARGS} --binlog-info=ON \ --force-non-empty-directories $master_key_options \ --keyring-vault-config=/etc/mysql/vault-keyring-secret/keyring_vault.conf --early-plugin-load=keyring_vault.so \ --xtrabackup-plugin-dir=/usr/lib64/xtrabackup/plugin --target-dir=$tmp" -xtrabackup ${XB_EXTRA_ARGS} --defaults-group=mysqld --datadir=/datadir --move-back --binlog-info=ON \ +xtrabackup --defaults-group=mysqld --datadir=/datadir --move-back ${XB_EXTRA_ARGS} --binlog-info=ON \ --force-non-empty-directories $transition_option $master_key_options \ --keyring-vault-config=/etc/mysql/vault-keyring-secret/keyring_vault.conf --early-plugin-load=keyring_vault.so \ --xtrabackup-plugin-dir=/usr/lib64/xtrabackup/plugin "--target-dir=$tmp" diff --git a/percona-xtradb-cluster-5.7-backup/recovery-pvc-joiner.sh b/percona-xtradb-cluster-5.7-backup/recovery-pvc-joiner.sh index 8a02a771..0a551c40 100755 --- a/percona-xtradb-cluster-5.7-backup/recovery-pvc-joiner.sh +++ b/percona-xtradb-cluster-5.7-backup/recovery-pvc-joiner.sh @@ -56,19 +56,19 @@ if [[ -n $transition_key && $transition_key != null ]]; then echo transition-key exists fi -echo "+ xtrabackup ${XB_EXTRA_ARGS} ${XB_USE_MEMORY+--use-memory=$XB_USE_MEMORY} --prepare --binlog-info=ON --rollback-prepared-trx \ +echo "+ xtrabackup ${XB_USE_MEMORY+--use-memory=$XB_USE_MEMORY} --prepare ${XB_EXTRA_ARGS} --binlog-info=ON --rollback-prepared-trx \ --xtrabackup-plugin-dir=/usr/lib64/xtrabackup/plugin --target-dir=$tmp" -innobackupex ${XB_USE_MEMORY+--use-memory=$XB_USE_MEMORY} --parallel=$(grep -c processor /proc/cpuinfo) --decompress $tmp -xtrabackup ${XB_EXTRA_ARGS} ${XB_USE_MEMORY+--use-memory=$XB_USE_MEMORY} --prepare --binlog-info=ON $transition_option --rollback-prepared-trx \ +innobackupex ${XB_USE_MEMORY+--use-memory=$XB_USE_MEMORY} --parallel=$(grep -c processor /proc/cpuinfo) ${XB_EXTRA_ARGS} --decompress $tmp +xtrabackup ${XB_USE_MEMORY+--use-memory=$XB_USE_MEMORY} --prepare ${XB_EXTRA_ARGS} --binlog-info=ON $transition_option --rollback-prepared-trx \ --xtrabackup-plugin-dir=/usr/lib64/xtrabackup/plugin --target-dir=$tmp -echo "+ xtrabackup ${XB_EXTRA_ARGS} --defaults-group=mysqld --datadir=/datadir --move-back --binlog-info=ON \ +echo "+ xtrabackup --defaults-group=mysqld --datadir=/datadir --move-back ${XB_EXTRA_ARGS} --binlog-info=ON \ --force-non-empty-directories $master_key_options \ --keyring-vault-config=/etc/mysql/vault-keyring-secret/keyring_vault.conf --early-plugin-load=keyring_vault.so \ --xtrabackup-plugin-dir=/usr/lib64/xtrabackup/plugin --target-dir=$tmp" -xtrabackup ${XB_EXTRA_ARGS} --defaults-group=mysqld --datadir=/datadir --move-back --binlog-info=ON \ +xtrabackup --defaults-group=mysqld --datadir=/datadir --move-back ${XB_EXTRA_ARGS} --binlog-info=ON \ --force-non-empty-directories $transition_option $master_key_options \ --keyring-vault-config=/etc/mysql/vault-keyring-secret/keyring_vault.conf --early-plugin-load=keyring_vault.so \ --xtrabackup-plugin-dir=/usr/lib64/xtrabackup/plugin --target-dir=$tmp diff --git a/percona-xtradb-cluster-8.0-backup/lib/pxc/backup.sh b/percona-xtradb-cluster-8.0-backup/lib/pxc/backup.sh index 817f5f36..a68c904d 100755 --- a/percona-xtradb-cluster-8.0-backup/lib/pxc/backup.sh +++ b/percona-xtradb-cluster-8.0-backup/lib/pxc/backup.sh @@ -8,7 +8,7 @@ XBCLOUD_ARGS="--curl-retriable-errors=7 $XBCLOUD_EXTRA_ARGS" INSECURE_ARG="" if [ -n "$VERIFY_TLS" ] && [[ $VERIFY_TLS == "false" ]]; then INSECURE_ARG="--insecure" - XBCLOUD_ARGS="${XBCLOUD_ARGS} --insecure" + XBCLOUD_ARGS="${INSECURE_ARG} ${XBCLOUD_ARGS}" fi S3_BUCKET_PATH=${S3_BUCKET_PATH:-$PXC_SERVICE-$(date +%F-%H-%M)-xtrabackup.stream} diff --git a/percona-xtradb-cluster-8.0-backup/recovery-cloud.sh b/percona-xtradb-cluster-8.0-backup/recovery-cloud.sh index 27575813..c63caab7 100755 --- a/percona-xtradb-cluster-8.0-backup/recovery-cloud.sh +++ b/percona-xtradb-cluster-8.0-backup/recovery-cloud.sh @@ -13,7 +13,7 @@ XBCLOUD_ARGS="--curl-retriable-errors=7 $XBCLOUD_EXTRA_ARGS" MC_ARGS='-C /tmp/mc' if [ -n "$VERIFY_TLS" ] && [[ $VERIFY_TLS == "false" ]]; then - XBCLOUD_ARGS="${XBCLOUD_ARGS} --insecure" + XBCLOUD_ARGS="--insecure ${XBCLOUD_ARGS}" MC_ARGS="${MC_ARGS} --insecure" fi @@ -42,8 +42,8 @@ destination() { fi } -xbcloud get ${XBCLOUD_ARGS} "$(destination).sst_info" --parallel="$(grep -c processor /proc/cpuinfo)" | xbstream -x -C "${tmp}" --parallel="$(grep -c processor /proc/cpuinfo)" $XBSTREAM_EXTRA_ARGS -xbcloud get ${XBCLOUD_ARGS} "$(destination)" --parallel="$(grep -c processor /proc/cpuinfo)" | xbstream --decompress -x -C "${tmp}" --parallel="$(grep -c processor /proc/cpuinfo)" $XBSTREAM_EXTRA_ARGS +xbcloud get --parallel="$(grep -c processor /proc/cpuinfo)" ${XBCLOUD_ARGS} "$(destination).sst_info" | xbstream -x -C "${tmp}" --parallel="$(grep -c processor /proc/cpuinfo)" $XBSTREAM_EXTRA_ARGS +xbcloud get --parallel="$(grep -c processor /proc/cpuinfo)" ${XBCLOUD_ARGS} "$(destination)" | xbstream --decompress -x -C "${tmp}" --parallel="$(grep -c processor /proc/cpuinfo)" $XBSTREAM_EXTRA_ARGS set +o xtrace transition_key=$(vault_get "$tmp/sst_info") @@ -53,18 +53,18 @@ if [[ -n $transition_key && $transition_key != null ]]; then echo transition-key exists fi -echo "+ xtrabackup ${XB_EXTRA_ARGS} ${XB_USE_MEMORY+--use-memory=$XB_USE_MEMORY} --prepare --rollback-prepared-trx \ +echo "+ xtrabackup ${XB_USE_MEMORY+--use-memory=$XB_USE_MEMORY} --prepare ${XB_EXTRA_ARGS} --rollback-prepared-trx \ --xtrabackup-plugin-dir=/usr/lib64/xtrabackup/plugin --target-dir=$tmp" -xtrabackup ${XB_EXTRA_ARGS} ${XB_USE_MEMORY+--use-memory=$XB_USE_MEMORY} --prepare ${transition_option:+"$transition_option"} --rollback-prepared-trx \ +xtrabackup ${XB_USE_MEMORY+--use-memory=$XB_USE_MEMORY} --prepare ${transition_option:+"$transition_option"} ${XB_EXTRA_ARGS} --rollback-prepared-trx \ --xtrabackup-plugin-dir=/usr/lib64/xtrabackup/plugin "--target-dir=$tmp" -echo "+ xtrabackup ${XB_EXTRA_ARGS} --defaults-group=mysqld --datadir=/datadir --move-back \ +echo "+ xtrabackup --defaults-group=mysqld --datadir=/datadir --move-back ${XB_EXTRA_ARGS} \ --force-non-empty-directories $master_key_options \ --keyring-vault-config=/etc/mysql/vault-keyring-secret/keyring_vault.conf --early-plugin-load=keyring_vault.so \ --xtrabackup-plugin-dir=/usr/lib64/xtrabackup/plugin --target-dir=$tmp" -xtrabackup ${XB_EXTRA_ARGS} --defaults-group=mysqld --datadir=/datadir --move-back \ +xtrabackup --defaults-group=mysqld --datadir=/datadir --move-back ${XB_EXTRA_ARGS} \ --force-non-empty-directories ${transition_option:+"$transition_option"} $master_key_options \ --keyring-vault-config=/etc/mysql/vault-keyring-secret/keyring_vault.conf --early-plugin-load=keyring_vault.so \ --xtrabackup-plugin-dir=/usr/lib64/xtrabackup/plugin "--target-dir=$tmp" diff --git a/percona-xtradb-cluster-8.0-backup/recovery-pvc-joiner.sh b/percona-xtradb-cluster-8.0-backup/recovery-pvc-joiner.sh index e4884b1a..b24f9cf7 100755 --- a/percona-xtradb-cluster-8.0-backup/recovery-pvc-joiner.sh +++ b/percona-xtradb-cluster-8.0-backup/recovery-pvc-joiner.sh @@ -50,18 +50,18 @@ if [[ -n $transition_key && $transition_key != null ]]; then echo transition-key exists fi -echo "+ xtrabackup ${XB_EXTRA_ARGS} ${XB_USE_MEMORY+--use-memory=$XB_USE_MEMORY} --prepare --rollback-prepared-trx \ +echo "+ xtrabackup ${XB_USE_MEMORY+--use-memory=$XB_USE_MEMORY} --prepare ${XB_EXTRA_ARGS} --rollback-prepared-trx \ --xtrabackup-plugin-dir=/usr/lib64/xtrabackup/plugin --target-dir=$tmp" -xtrabackup ${XB_EXTRA_ARGS} ${XB_USE_MEMORY+--use-memory=$XB_USE_MEMORY} --prepare $transition_option --rollback-prepared-trx \ +xtrabackup ${XB_USE_MEMORY+--use-memory=$XB_USE_MEMORY} --prepare ${XB_EXTRA_ARGS} $transition_option --rollback-prepared-trx \ --xtrabackup-plugin-dir=/usr/lib64/xtrabackup/plugin --target-dir=$tmp -echo "+ xtrabackup ${XB_EXTRA_ARGS} --defaults-group=mysqld --datadir=/datadir --move-back \ +echo "+ xtrabackup --defaults-group=mysqld --datadir=/datadir --move-back ${XB_EXTRA_ARGS} \ --force-non-empty-directories $master_key_options \ --keyring-vault-config=/etc/mysql/vault-keyring-secret/keyring_vault.conf --early-plugin-load=keyring_vault.so \ --xtrabackup-plugin-dir=/usr/lib64/xtrabackup/plugin --target-dir=$tmp" -xtrabackup ${XB_EXTRA_ARGS} --defaults-group=mysqld --datadir=/datadir --move-back \ +xtrabackup --defaults-group=mysqld --datadir=/datadir --move-back ${XB_EXTRA_ARGS} \ --force-non-empty-directories $transition_option $master_key_options \ --keyring-vault-config=/etc/mysql/vault-keyring-secret/keyring_vault.conf --early-plugin-load=keyring_vault.so \ --xtrabackup-plugin-dir=/usr/lib64/xtrabackup/plugin --target-dir=$tmp diff --git a/percona-xtradb-cluster-8.0-backup/run_backup.sh b/percona-xtradb-cluster-8.0-backup/run_backup.sh index 247db2c6..50d63554 100755 --- a/percona-xtradb-cluster-8.0-backup/run_backup.sh +++ b/percona-xtradb-cluster-8.0-backup/run_backup.sh @@ -114,13 +114,13 @@ backup_s3() { vault_store /tmp/${SST_INFO_NAME} xbstream -C /tmp -c ${SST_INFO_NAME} $XBSTREAM_EXTRA_ARGS \ - | xbcloud put $XBCLOUD_ARGS --storage=s3 --parallel="$(grep -c processor /proc/cpuinfo)" --md5 --s3-bucket="$S3_BUCKET" "$S3_BUCKET_PATH.$SST_INFO_NAME" 2>&1 \ + | xbcloud put --parallel="$(grep -c processor /proc/cpuinfo)" --storage=s3 --md5 $XBCLOUD_ARGS --s3-bucket="$S3_BUCKET" "$S3_BUCKET_PATH.$SST_INFO_NAME" 2>&1 \ | (grep -v "error: http request failed: Couldn't resolve host name" || exit 1) if ((SST_FAILED == 0)); then FIRST_RECEIVED=0 socat -u "$SOCAT_OPTS" stdio \ - | xbcloud put $XBCLOUD_ARGS --storage=s3 --parallel="$(grep -c processor /proc/cpuinfo)" --md5 --s3-bucket="$S3_BUCKET" "$S3_BUCKET_PATH" 2>&1 \ + | xbcloud put --storage=s3 --parallel="$(grep -c processor /proc/cpuinfo)" --md5 $XBCLOUD_ARGS --s3-bucket="$S3_BUCKET" "$S3_BUCKET_PATH" 2>&1 \ | (grep -v "error: http request failed: Couldn't resolve host name" || exit 1) FIRST_RECEIVED=1 fi @@ -155,13 +155,13 @@ backup_azure() { vault_store /tmp/${SST_INFO_NAME} xbstream -C /tmp -c ${SST_INFO_NAME} $XBSTREAM_EXTRA_ARGS \ - | xbcloud put $XBCLOUD_ARGS --storage=azure --parallel="$(grep -c processor /proc/cpuinfo)" "$BACKUP_PATH.$SST_INFO_NAME" 2>&1 \ + | xbcloud put --parallel="$(grep -c processor /proc/cpuinfo)" $XBCLOUD_ARGS --storage=azure "$BACKUP_PATH.$SST_INFO_NAME" 2>&1 \ | (grep -v "error: http request failed: Couldn't resolve host name" || exit 1) if ((SST_FAILED == 0)); then FIRST_RECEIVED=0 socat -u "$SOCAT_OPTS" stdio \ - | xbcloud put $XBCLOUD_ARGS --storage=azure --parallel="$(grep -c processor /proc/cpuinfo)" "$BACKUP_PATH" 2>&1 \ + | xbcloud put --parallel="$(grep -c processor /proc/cpuinfo)" $XBCLOUD_ARGS --storage=azure "$BACKUP_PATH" 2>&1 \ | (grep -v "error: http request failed: Couldn't resolve host name" || exit 1) FIRST_RECEIVED=1 fi