Skip to content

K8SPS-469 fix data-at-rest tests #1122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 8, 2025
Merged

K8SPS-469 fix data-at-rest tests #1122

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
36a7236
Fix data-at-rest tests
pooknull Oct 8, 2025
c7b78d3
Update build/run-restore.sh
pooknull Oct 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/run-restore.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
set -e
set -o xtrace

XTRABACKUP_VERSION=$(xtrabackup --version 2>&1 | awk '{print $3}' | awk -F'.' '{print $1"."$2}')
XTRABACKUP_VERSION=$(xtrabackup --version 2>&1 | awk '/^xtrabackup version/{print $3}' | awk -F'.' '{print $1"."$2}')
DATADIR=${DATADIR:-/var/lib/mysql}
PARALLEL=$(grep -c processor /proc/cpuinfo)
XBCLOUD_ARGS="--curl-retriable-errors=7 --parallel=${PARALLEL} ${XBCLOUD_EXTRA_ARGS}"
Expand All @@ -12,15 +12,15 @@
fi

run_s3() {
xbcloud get ${XBCLOUD_ARGS} "${BACKUP_DEST}" --storage=s3 --s3-bucket="${S3_BUCKET}"

Check notice on line 15 in build/run-restore.sh

View workflow job for this annotation

GitHub Actions / shellcheck

[shellcheck] build/run-restore.sh#L15 <ShellCheck.SC2086> 

Double quote to prevent globbing and word splitting.
Raw output 
./build/run-restore.sh:15:14: info: Double quote to prevent globbing and word splitting. (ShellCheck.SC2086)
}

run_gcs() {
xbcloud get ${XBCLOUD_ARGS} "${BACKUP_DEST}" --storage=google --google-bucket="${GCS_BUCKET}"

Check notice on line 19 in build/run-restore.sh

View workflow job for this annotation

GitHub Actions / shellcheck

[shellcheck] build/run-restore.sh#L19 <ShellCheck.SC2086> 

Double quote to prevent globbing and word splitting.
Raw output 
./build/run-restore.sh:19:14: info: Double quote to prevent globbing and word splitting. (ShellCheck.SC2086)
}

run_azure() {
xbcloud get ${XBCLOUD_ARGS} "${BACKUP_DEST}" --storage=azure

Check notice on line 23 in build/run-restore.sh

View workflow job for this annotation

GitHub Actions / shellcheck

[shellcheck] build/run-restore.sh#L23 <ShellCheck.SC2086> 

Double quote to prevent globbing and word splitting.
Raw output 
./build/run-restore.sh:23:14: info: Double quote to prevent globbing and word splitting. (ShellCheck.SC2086)
}

extract() {
Expand Down Expand Up @@ -50,7 +50,7 @@
keyring="--keyring-vault-config=${KEYRING_VAULT_PATH}"
elif [[ ${XTRABACKUP_VERSION} == "8.4" ]]; then
# PXB expects the config with a specific name
cp ${KEYRING_VAULT_PATH} /tmp/component_keyring_vault.cnf

Check notice on line 53 in build/run-restore.sh

View workflow job for this annotation

GitHub Actions / shellcheck

[shellcheck] build/run-restore.sh#L53 <ShellCheck.SC2086> 

Double quote to prevent globbing and word splitting.
Raw output 
./build/run-restore.sh:53:7: info: Double quote to prevent globbing and word splitting. (ShellCheck.SC2086)
echo "Using keyring vault component: /tmp/component_keyring_vault.cnf"
keyring="--component-keyring-config=/tmp/component_keyring_vault.cnf"
fi
Expand Down
Loading