Skip to content

Allow restore without sst_info #2182

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

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Allow restore without sst_info #2182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b6e6db
Allow restore without sst_info
hors Aug 29, 2025
afafff8
Merge branch 'main' into without_sst_info
hors Sep 30, 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
4 changes: 4 additions & 0 deletions build/backup/lib/pxc/vault.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@
local key=$1
local file_path=$2

if [ ! -f $file_path ]; then

Check notice on line 11 in build/backup/lib/pxc/vault.sh

View workflow job for this annotation

GitHub Actions / shellcheck

[shellcheck] build/backup/lib/pxc/vault.sh#L11 <ShellCheck.SC2086> 

Double quote to prevent globbing and word splitting.
Raw output 
./build/backup/lib/pxc/vault.sh:11:12: info: Double quote to prevent globbing and word splitting. (ShellCheck.SC2086)
echo "File $file_path does not exist" >&2
exit 0
fi
awk -F "=[ ]*" "/${key}[ ]*=/ {print \$2}" "$file_path"
}

Expand Down
4 changes: 2 additions & 2 deletions build/backup/recovery-cloud.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ destination() {
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

MYSQL_VERSION=$(parse_ini 'mysql-version' "$tmp/sst_info")
if check_for_version "$MYSQL_VERSION" '8.0.0'; then
if [ -z "$MYSQL_VERSION" ] || check_for_version "$MYSQL_VERSION" '8.0.0'; then
XBSTREAM_EXTRA_ARGS="$XBSTREAM_EXTRA_ARGS --decompress"
fi

Expand All @@ -69,7 +69,7 @@ if [[ -n $transition_key && $transition_key != null ]]; then
echo transition-key exists
fi

if ! check_for_version "$MYSQL_VERSION" '8.0.0'; then
if [ -n "$MYSQL_VERSION" ] && ! check_for_version "$MYSQL_VERSION" '8.0.0'; then
# shellcheck disable=SC2086
innobackupex ${XB_USE_MEMORY+--use-memory=$XB_USE_MEMORY} --parallel="$(grep -c processor /proc/cpuinfo)" ${XB_EXTRA_ARGS} --decompress "$tmp"
XB_EXTRA_ARGS="$XB_EXTRA_ARGS --binlog-info=ON"
Expand Down
Loading