Skip to content

Commit a2a0381

Browse files
grooverdangrooverdan
committed
wsrep_sst_xtrabackup*: use wsrep_sst_common parsed vars
1 parent 51ea696 commit a2a0381

File tree

2 files changed

+17
-64
lines changed

2 files changed

+17
-64
lines changed

‎scripts/wsrep_sst_xtrabackup-v2.sh

Lines changed: 9 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,13 @@ ecode=0
3232
ssyslog=""
3333
ssystag=""
3434
XTRABACKUP_PID=""
35-
SST_PORT=""
36-
REMOTEIP=""
3735
tca=""
3836
tcert=""
3937
tkey=""
4038
sockopt=""
4139
progress=""
4240
ttime=0
4341
totime=0
44-
lsn=""
4542
ecmd=""
4643
rlimit=""
4744
# Initially
@@ -76,11 +73,6 @@ ssl_cert=""
7673
ssl_ca=""
7774
ssl_key=""
7875

79-
# Required for backup locks
80-
# For backup locks it is 1 sent by joiner
81-
# 5.6.21 PXC and later can't donate to an older joiner
82-
sst_ver=1
83-
8476
if which pv &>/dev/null && pv --help | grep -q FORMAT;then
8577
pvopts+=$pvformat
8678
fi
@@ -250,11 +242,7 @@ verify_file_exists()
250242

251243
get_transfer()
252244
{
253-
if [[ -z $SST_PORT ]];then
254-
TSST_PORT=4444
255-
else
256-
TSST_PORT=$SST_PORT
257-
fi
245+
TSST_PORT=${WSREP_SST_OPT_PORT:-4444}
258246

259247
if [[ $tfmt == 'nc' ]];then
260248
if [[ ! -x `which nc` ]];then
@@ -279,7 +267,7 @@ get_transfer()
279267
fi
280268
else
281269
# netcat doesn't understand [] around IPv6 address
282-
tcmd="nc ${REMOTEIP//[\[\]]/} ${TSST_PORT}"
270+
tcmd="nc ${WSREP_SST_OPT_HOST_UNESCAPED} ${TSST_PORT}"
283271
fi
284272
else
285273
tfmt='socat'
@@ -341,7 +329,7 @@ get_transfer()
341329
tcmd="socat -u openssl-listen:${TSST_PORT},reuseaddr,cert=${tcert},cafile=${tca}${joiner_extra}${sockopt} stdio"
342330
else
343331
wsrep_log_info "Encrypting with CERT: $tcert, CA: $tca"
344-
tcmd="socat -u stdio openssl-connect:${REMOTEIP}:${TSST_PORT},cert=${tcert},cafile=${tca}${donor_extra}${sockopt}"
332+
tcmd="socat -u stdio openssl-connect:${WSREP_SST_OPT_HOST}:${TSST_PORT},cert=${tcert},cafile=${tca}${donor_extra}${sockopt}"
345333
fi
346334
elif [[ $encrypt -eq 3 ]];then
347335
wsrep_log_warning "**** WARNING **** encrypt=3 is deprecated and will be removed in a future release"
@@ -358,7 +346,7 @@ get_transfer()
358346
tcmd="socat -u openssl-listen:${TSST_PORT},reuseaddr,cert=${tcert},key=${tkey},verify=0${joiner_extra}${sockopt} stdio"
359347
else
360348
wsrep_log_info "Encrypting with CERT: $tcert, KEY: $tkey"
361-
tcmd="socat -u stdio openssl-connect:${REMOTEIP}:${TSST_PORT},cert=${tcert},key=${tkey},verify=0${sockopt}"
349+
tcmd="socat -u stdio openssl-connect:${WSREP_SST_OPT_HOST}:${TSST_PORT},cert=${tcert},key=${tkey},verify=0${sockopt}"
362350
fi
363351
elif [[ $encrypt -eq 4 ]]; then
364352
wsrep_log_info "Using openssl based encryption with socat: with key, crt, and ca"
@@ -379,7 +367,7 @@ get_transfer()
379367
tcmd="socat -u openssl-listen:${TSST_PORT},reuseaddr,cert=${ssl_cert},key=${ssl_key},cafile=${ssl_ca},verify=1${joiner_extra}${sockopt} stdio"
380368
else
381369
wsrep_log_info "Encrypting with CERT: $ssl_cert, KEY: $ssl_key, CA: $ssl_ca"
382-
tcmd="socat -u stdio openssl-connect:${REMOTEIP}:${TSST_PORT},cert=${ssl_cert},key=${ssl_key},cafile=${ssl_ca},verify=1${donor_extra}${sockopt}"
370+
tcmd="socat -u stdio openssl-connect:${WSREP_SST_OPT_HOST}:${TSST_PORT},cert=${ssl_cert},key=${ssl_key},cafile=${ssl_ca},verify=1${donor_extra}${sockopt}"
383371
fi
384372

385373
else
@@ -390,7 +378,7 @@ get_transfer()
390378
if [[ "$WSREP_SST_OPT_ROLE" == "joiner" ]]; then
391379
tcmd="socat -u TCP-LISTEN:${TSST_PORT},reuseaddr${sockopt} stdio"
392380
else
393-
tcmd="socat -u stdio TCP:${REMOTEIP}:${TSST_PORT}${sockopt}"
381+
tcmd="socat -u stdio TCP:${WSREP_SST_OPT_HOST}:${TSST_PORT}${sockopt}"
394382
fi
395383
fi
396384
fi
@@ -634,18 +622,6 @@ kill_xtrabackup()
634622
rm -f "$XTRABACKUP_PID" || true
635623
}
636624

637-
setup_ports()
638-
{
639-
if [[ "$WSREP_SST_OPT_ROLE" == "donor" ]];then
640-
SST_PORT=$WSREP_SST_OPT_PORT
641-
REMOTEIP=$WSREP_SST_OPT_HOST
642-
lsn=$(echo $WSREP_SST_OPT_PATH | awk -F '[/]' '{ print $2 }')
643-
sst_ver=$(echo $WSREP_SST_OPT_PATH | awk -F '[/]' '{ print $3 }')
644-
else
645-
SST_PORT=$WSREP_SST_OPT_PORT
646-
fi
647-
}
648-
649625
# waits ~1 minute for nc/socat to open the port and then reports ready
650626
# (regardless of timeout)
651627
wait_for_listen()
@@ -660,7 +636,7 @@ wait_for_listen()
660636
sleep 0.2
661637
done
662638

663-
echo "ready ${HOST}:${PORT}/${MODULE}//$sst_ver"
639+
echo "ready ${HOST}:${PORT}/${MODULE}//${WSREP_SST_OPT_SST_VER:-1}"
664640
}
665641

666642
check_extra()
@@ -829,7 +805,6 @@ if [[ ! ${WSREP_SST_OPT_ROLE} == 'joiner' && ! ${WSREP_SST_OPT_ROLE} == 'donor'
829805
fi
830806

831807
read_cnf
832-
setup_ports
833808

834809
if ${INNOBACKUPEX_BIN} /tmp --help 2>/dev/null | grep -q -- '--version-check'; then
835810
disver="--no-version-check"
@@ -895,7 +870,7 @@ then
895870
if [ $WSREP_SST_OPT_BYPASS -eq 0 ]
896871
then
897872
usrst=0
898-
if [[ -z $sst_ver ]];then
873+
if [[ -z $WSREP_SST_OPT_SST_VER ]];then
899874
wsrep_log_error "Upgrade joiner to 5.6.21 or higher for backup locks support"
900875
wsrep_log_error "The joiner is not supported for this version of donor"
901876
exit 93
@@ -956,7 +931,7 @@ then
956931
wsrep_log_info "Sleeping before data transfer for SST"
957932
sleep 10
958933

959-
wsrep_log_info "Streaming the backup to joiner at ${REMOTEIP} ${SST_PORT:-4444}"
934+
wsrep_log_info "Streaming the backup to joiner at ${WSREP_SST_OPT_HOST} ${WSREP_SST_OPT_PORT:-4444}"
960935

961936
# Add compression to the head of the stream (if specified)
962937
if [[ -n $scomp ]]; then

‎scripts/wsrep_sst_xtrabackup.sh

Lines changed: 8 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,13 @@ encrypt=0
3030
nproc=1
3131
ecode=0
3232
XTRABACKUP_PID=""
33-
SST_PORT=""
34-
REMOTEIP=""
3533
tcert=""
3634
tpem=""
3735
sockopt=""
3836
progress=""
3937
ttime=0
4038
totime=0
41-
lsn=""
39+
lsn="${WSREP_SST_OPT_LSN}"
4240
incremental=0
4341
ecmd=""
4442
rlimit=""
@@ -136,11 +134,7 @@ get_keys()
136134

137135
get_transfer()
138136
{
139-
if [[ -z $SST_PORT ]];then
140-
TSST_PORT=4444
141-
else
142-
TSST_PORT=$SST_PORT
143-
fi
137+
TSST_PORT=${WSREP_SST_OPT_PORT:-4444}
144138

145139
if [[ $tfmt == 'nc' ]];then
146140
if [[ ! -x `which nc` ]];then
@@ -155,7 +149,7 @@ get_transfer()
155149
tcmd="nc -dl ${TSST_PORT}"
156150
fi
157151
else
158-
tcmd="nc ${REMOTEIP} ${TSST_PORT}"
152+
tcmd="nc ${WSREP_SST_OPT_HOST_UNESCAPED} ${TSST_PORT}"
159153
fi
160154
else
161155
tfmt='socat'
@@ -181,13 +175,13 @@ get_transfer()
181175
tcmd="socat -u openssl-listen:${TSST_PORT},reuseaddr,cert=$tpem,cafile=${tcert}${sockopt} stdio"
182176
else
183177
wsrep_log_info "Encrypting with PEM $tpem, CA: $tcert"
184-
tcmd="socat -u stdio openssl-connect:${REMOTEIP}:${TSST_PORT},cert=$tpem,cafile=${tcert}${sockopt}"
178+
tcmd="socat -u stdio openssl-connect:${WSREP_SST_OPT_HOST}:${TSST_PORT},cert=$tpem,cafile=${tcert}${sockopt}"
185179
fi
186180
else
187181
if [[ "$WSREP_SST_OPT_ROLE" == "joiner" ]];then
188182
tcmd="socat -u TCP-LISTEN:${TSST_PORT},reuseaddr${sockopt} stdio"
189183
else
190-
tcmd="socat -u stdio TCP:${REMOTEIP}:${TSST_PORT}${sockopt}"
184+
tcmd="socat -u stdio TCP:${WSREP_SST_OPT_HOST}:${TSST_PORT}${sockopt}"
191185
fi
192186
fi
193187
fi
@@ -343,17 +337,6 @@ kill_xtrabackup()
343337
rm -f "$XTRABACKUP_PID"
344338
}
345339

346-
setup_ports()
347-
{
348-
if [[ "$WSREP_SST_OPT_ROLE" == "donor" ]];then
349-
SST_PORT=$(echo $WSREP_SST_OPT_ADDR | awk -F '[:/]' '{ print $2 }')
350-
REMOTEIP=$(echo $WSREP_SST_OPT_ADDR | awk -F ':' '{ print $1 }')
351-
lsn=$(echo $WSREP_SST_OPT_ADDR | awk -F '[:/]' '{ print $4 }')
352-
else
353-
SST_PORT=$(echo ${WSREP_SST_OPT_ADDR} | awk -F ':' '{ print $2 }')
354-
fi
355-
}
356-
357340
# waits ~10 seconds for nc to open the port and then reports ready
358341
# (regardless of timeout)
359342
wait_for_listen()
@@ -462,7 +445,7 @@ then
462445

463446
check_extra
464447

465-
wsrep_log_info "Streaming the backup to joiner at ${REMOTEIP} ${SST_PORT}"
448+
wsrep_log_info "Streaming the backup to joiner at ${WSREP_SST_OPT_HOST} ${WSREP_SST_OPT_PORT}"
466449

467450
if [[ -n $progress ]];then
468451
get_footprint
@@ -542,14 +525,9 @@ then
542525
# May need xtrabackup_checkpoints later on
543526
rm -f ${DATA}/xtrabackup_binary ${DATA}/xtrabackup_galera_info ${DATA}/xtrabackup_logfile
544527

545-
ADDR=${WSREP_SST_OPT_ADDR}
546-
if [ -z "${SST_PORT}" ]
547-
then
548-
SST_PORT=4444
549-
ADDR="$(echo ${WSREP_SST_OPT_ADDR} | awk -F ':' '{ print $1 }'):${SST_PORT}"
550-
fi
528+
ADDR="${WSREP_SST_OPT_HOST}:${WSREP_SST_OPT_PORT:-4444}"
551529

552-
wait_for_listen ${SST_PORT} ${ADDR} ${MODULE} &
530+
wait_for_listen ${WSREP_SST_OPT_PORT:-4444} ${ADDR} ${MODULE} &
553531

554532
trap sig_joiner_cleanup HUP PIPE INT TERM
555533
trap cleanup_joiner EXIT

0 commit comments

Comments
 (0)