@@ -95,9 +95,9 @@ sst_ver=1
95
95
96
96
declare -a RC
97
97
98
- BACKUP_BIN=$( commandex ' mariabackup ' )
98
+ BACKUP_BIN=$( commandex ' mariadb-backup ' )
99
99
if [ -z " $BACKUP_BIN " ]; then
100
- wsrep_log_error ' mariabackup binary not found in path'
100
+ wsrep_log_error ' mariadb-backup binary not found in path'
101
101
exit 42
102
102
fi
103
103
@@ -685,7 +685,7 @@ cleanup_at_exit()
685
685
if [ -n " $BACKUP_PID " ]; then
686
686
if check_pid " $BACKUP_PID " 1; then
687
687
wsrep_log_error \
688
- " mariabackup process is still running. Killing..."
688
+ " mariadb-backup process is still running. Killing..."
689
689
cleanup_pid $CHECK_PID " $BACKUP_PID "
690
690
fi
691
691
fi
@@ -761,7 +761,7 @@ check_extra()
761
761
if [ " $thread_handling " = ' pool-of-threads' ]; then
762
762
local eport=$( parse_cnf ' --mysqld' ' extra-port' )
763
763
if [ -n " $eport " ]; then
764
- # mariabackup works only locally.
764
+ # mariadb-backup works only locally.
765
765
# Hence, setting host to 127.0.0.1 unconditionally:
766
766
wsrep_log_info " SST through extra_port $eport "
767
767
INNOEXTRA=" $INNOEXTRA --host=127.0.0.1 --port=$eport "
@@ -930,7 +930,7 @@ cd "$OLD_PWD"
930
930
931
931
if [ $ssyslog -eq 1 ]; then
932
932
if [ -n " $( commandex logger) " ]; then
933
- wsrep_log_info " Logging all stderr of SST/mariabackup to syslog"
933
+ wsrep_log_info " Logging all stderr of SST/mariadb-backup to syslog"
934
934
935
935
exec 2> >( logger -p daemon.err -t ${ssystag} wsrep-sst-$WSREP_SST_OPT_ROLE )
936
936
@@ -1053,11 +1053,11 @@ if [ "$WSREP_SST_OPT_ROLE" = 'donor' ]; then
1053
1053
xtmpdir=$( TMPDIR=" $tmpdir " ; mktemp ' -d' )
1054
1054
fi
1055
1055
1056
- wsrep_log_info " Using '$xtmpdir ' as mariabackup temporary directory"
1056
+ wsrep_log_info " Using '$xtmpdir ' as mariadb-backup temporary directory"
1057
1057
tmpopts=" --tmpdir='$xtmpdir '"
1058
1058
1059
1059
itmpdir=" $( mktemp -d) "
1060
- wsrep_log_info " Using '$itmpdir ' as mariabackup working directory"
1060
+ wsrep_log_info " Using '$itmpdir ' as mariadb-abackup working directory"
1061
1061
1062
1062
usrst=0
1063
1063
if [ -n " $WSREP_SST_OPT_USER " ]; then
@@ -1148,7 +1148,7 @@ if [ "$WSREP_SST_OPT_ROLE" = 'donor' ]; then
1148
1148
fi
1149
1149
1150
1150
# if compression is enabled for backup files, then add the
1151
- # appropriate options to the mariabackup command line:
1151
+ # appropriate options to the mariadb-backup command line:
1152
1152
if [ " $compress " != ' none' ]; then
1153
1153
iopts=" --compress${compress: +=$compress }${iopts: + } $iopts "
1154
1154
if [ -n " $compress_threads " ]; then
@@ -1170,15 +1170,15 @@ if [ "$WSREP_SST_OPT_ROLE" = 'donor' ]; then
1170
1170
set -e
1171
1171
1172
1172
if [ ${RC[0]} -ne 0 ]; then
1173
- wsrep_log_error " mariabackup finished with error: ${RC[0]} ." \
1173
+ wsrep_log_error " mariadb-backup finished with error: ${RC[0]} ." \
1174
1174
" Check syslog or '$INNOBACKUPLOG ' for details"
1175
1175
exit 22
1176
1176
elif [ ${RC[$(( ${#RC[@]} -1 ))]} -eq 1 ]; then
1177
1177
wsrep_log_error " $tcmd finished with error: ${RC[1]} "
1178
1178
exit 22
1179
1179
fi
1180
1180
1181
- # mariabackup implicitly writes PID to fixed location in $xtmpdir
1181
+ # mariadb-backup implicitly writes PID to fixed location in $xtmpdir
1182
1182
BACKUP_PID=" $xtmpdir /xtrabackup_pid"
1183
1183
1184
1184
else # BYPASS FOR IST
@@ -1450,14 +1450,14 @@ else # joiner
1450
1450
1451
1451
if [ ! -s " $DATA /xtrabackup_checkpoints" ]; then
1452
1452
wsrep_log_error " xtrabackup_checkpoints missing," \
1453
- " failed mariabackup /SST on donor"
1453
+ " failed mariadb-backup /SST on donor"
1454
1454
exit 2
1455
1455
fi
1456
1456
1457
- # Compact backups are not supported by mariabackup
1457
+ # Compact backups are not supported by mariadb-backup
1458
1458
if grep -qw -F ' compact = 1' " $DATA /xtrabackup_checkpoints" ; then
1459
1459
wsrep_log_info " Index compaction detected"
1460
- wsrel_log_error " Compact backups are not supported by mariabackup "
1460
+ wsrel_log_error " Compact backups are not supported by mariadb-backup "
1461
1461
exit 2
1462
1462
fi
1463
1463
@@ -1509,9 +1509,9 @@ else # joiner
1509
1509
1510
1510
wsrep_log_info " Preparing the backup at $DATA "
1511
1511
setup_commands
1512
- timeit ' mariabackup prepare stage' " $INNOAPPLY "
1512
+ timeit ' mariadb-backup prepare stage' " $INNOAPPLY "
1513
1513
if [ $? -ne 0 ]; then
1514
- wsrep_log_error " mariabackup apply finished with errors." \
1514
+ wsrep_log_error " mariadb-backup apply finished with errors." \
1515
1515
" Check syslog or '$INNOAPPLYLOG ' for details."
1516
1516
exit 22
1517
1517
fi
@@ -1556,7 +1556,7 @@ else # joiner
1556
1556
MAGIC_FILE=" $TDATA /$INFO_FILE "
1557
1557
1558
1558
wsrep_log_info " Moving the backup to $TDATA "
1559
- timeit ' mariabackup move stage' " $INNOMOVE "
1559
+ timeit ' mariadb-backup move stage' " $INNOMOVE "
1560
1560
if [ $? -eq 0 ]; then
1561
1561
wsrep_log_info " Move successful, removing $DATA "
1562
1562
rm -rf " $DATA "
0 commit comments