Skip to content

Commit c4b7074

Browse files
committed
wsrep_sst_xtrabackup*: use mysqld defaults arguments
It was assumed in https://bugs.launchpad.net/codership-mysql/+bug/1378355 that xtrabackup didn't have the groups-defaults-suffix because it wasn't listed in the help output. Also --defaults-group was always just an additional group despite the misleading description implying it was a replacement. So actually we can use the default* mysqld arguements to xtrabackup as the standard mysqld configuration parser was used.
1 parent 3f27fa3 commit c4b7074

File tree

2 files changed

+5
-19
lines changed

2 files changed

+5
-19
lines changed

scripts/wsrep_sst_xtrabackup-v2.sh

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -852,16 +852,9 @@ fi
852852
get_stream
853853
get_transfer
854854

855-
# This is as close as innobackupex gets to mysqld defaults. Important note --defaults-extra-file passed to
856-
# mysqld is not passed to innobackupex.
857-
# WSREP_SST_OPT_SUFFIX_DEFAULT goes from --defaults-group-suffix=.X to --defaults-group=mysqld.X
858-
# Ref: https://bugs.launchpad.net/codership-mysql/+bug/1378355
859-
860-
readonly INNOBACKUP_OPT_DEFAULT="${$WSREP_SST_OPT_DEFAULT} ${WSREP_SST_OPT_SUFFIX_DEFAULT/-suffix=/=mysqld}"
861-
862855
INNOAPPLY="${INNOBACKUPEX_BIN} $disver $iapts --apply-log \$rebuildcmd \${DATA} ${INNOAPPLY}"
863-
INNOMOVE="${INNOBACKUPEX_BIN} ${INNOBACKUP_OPT_DEFAULT} $disver $impts --move-back --force-non-empty-directories \${DATA} ${INNOMOVE}"
864-
INNOBACKUP="${INNOBACKUPEX_BIN} ${INNOBACKUP_OPT_DEFAULT} $disver $iopts \$tmpopts \$INNOEXTRA --galera-info --stream=\$sfmt \$itmpdir ${INNOBACKUP}"
856+
INNOMOVE="${INNOBACKUPEX_BIN} ${WSREP_SST_OPT_CONF} $disver $impts --move-back --force-non-empty-directories \${DATA} ${INNOMOVE}"
857+
INNOBACKUP="${INNOBACKUPEX_BIN} ${WSREP_SST_OPT_CONF} $disver $iopts \$tmpopts \$INNOEXTRA --galera-info --stream=\$sfmt \$itmpdir ${INNOBACKUP}"
865858

866859
if [ "$WSREP_SST_OPT_ROLE" = "donor" ]
867860
then

scripts/wsrep_sst_xtrabackup.sh

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -398,16 +398,9 @@ setup_ports
398398
get_stream
399399
get_transfer
400400

401-
# This is as close as innobackupex gets to mysqld defaults. Important note --defaults-extra-file passed to
402-
# mysqld is not passed to innobackupex.
403-
# WSREP_SST_OPT_SUFFIX_DEFAULT goes from --defaults-group-suffix=.X to --defaults-group=mysqld.X
404-
# Ref: https://bugs.launchpad.net/codership-mysql/+bug/1378355
405-
406-
readonly INNOBACKUP_OPT_DEFAULT="${$WSREP_SST_OPT_DEFAULT} ${WSREP_SST_OPT_SUFFIX_DEFAULT/-suffix=/=mysqld}"
407-
408401
INNOEXTRA=""
409-
INNOAPPLY="${INNOBACKUPEX_BIN} ${INNOBACKUP_OPT_DEFAULT} --apply-log \$rebuildcmd \${DATA} &>\${DATA}/innobackup.prepare.log"
410-
INNOBACKUP="${INNOBACKUPEX_BIN} ${INNOBACKUP_OPT_DEFAULT} \$INNOEXTRA --galera-info --stream=\$sfmt \${TMPDIR} 2>\${DATA}/innobackup.backup.log"
402+
INNOAPPLY="${INNOBACKUPEX_BIN} ${WSREP_SST_OPT_CONF} --apply-log \$rebuildcmd \${DATA} &>\${DATA}/innobackup.prepare.log"
403+
INNOBACKUP="${INNOBACKUPEX_BIN} ${WSREP_SST_OPT_CONF} \$INNOEXTRA --galera-info --stream=\$sfmt \${TMPDIR} 2>\${DATA}/innobackup.backup.log"
411404

412405
if [ "$WSREP_SST_OPT_ROLE" = "donor" ]
413406
then
@@ -660,7 +653,7 @@ then
660653

661654
if [[ $incremental -eq 1 ]];then
662655
# Added --ibbackup=xtrabackup_55 because it fails otherwise citing connection issues.
663-
INNOAPPLY="${INNOBACKUPEX_BIN} ${INNOBACKUP_OPT_DEFAULT} \
656+
INNOAPPLY="${INNOBACKUPEX_BIN} ${WSREP_SST_OPT_CONF} \
664657
--ibbackup=xtrabackup_55 --apply-log $rebuildcmd --redo-only $BDATA --incremental-dir=${DATA} &>>${BDATA}/innobackup.prepare.log"
665658
fi
666659

0 commit comments

Comments
 (0)