mirror of
https://github.com/MariaDB/server.git
synced 2026-05-15 11:27:39 +02:00
Merge branch 'github/10.0-galera' into 10.1
This commit is contained in:
Sergei Golubchik
commit
c383418cbf
10 changed files with 96 additions and 154 deletions
|
|
@ -32,9 +32,6 @@ ecode=0
|
|||
ssyslog=""
|
||||
ssystag=""
|
||||
XTRABACKUP_PID=""
|
||||
SST_PORT=""
|
||||
REMOTEIP=""
|
||||
REMOTEHOST=""
|
||||
tca=""
|
||||
tcert=""
|
||||
tkey=""
|
||||
|
|
@ -42,7 +39,6 @@ sockopt=""
|
|||
progress=""
|
||||
ttime=0
|
||||
totime=0
|
||||
lsn=""
|
||||
ecmd=""
|
||||
rlimit=""
|
||||
# Initially
|
||||
|
|
@ -77,11 +73,6 @@ ssl_cert=""
|
|||
ssl_ca=""
|
||||
ssl_key=""
|
||||
|
||||
# Required for backup locks
|
||||
# For backup locks it is 1 sent by joiner
|
||||
# 5.6.21 PXC and later can't donate to an older joiner
|
||||
sst_ver=1
|
||||
|
||||
if which pv &>/dev/null && pv --help | grep -q FORMAT;then
|
||||
pvopts+=$pvformat
|
||||
fi
|
||||
|
|
@ -258,11 +249,7 @@ verify_file_exists()
|
|||
|
||||
get_transfer()
|
||||
{
|
||||
if [[ -z $SST_PORT ]];then
|
||||
TSST_PORT=4444
|
||||
else
|
||||
TSST_PORT=$SST_PORT
|
||||
fi
|
||||
TSST_PORT=${WSREP_SST_OPT_PORT:-4444}
|
||||
|
||||
if [[ $tfmt == 'nc' ]];then
|
||||
if [[ ! -x `which nc` ]];then
|
||||
|
|
@ -287,7 +274,7 @@ get_transfer()
|
|||
fi
|
||||
else
|
||||
# netcat doesn't understand [] around IPv6 address
|
||||
tcmd="nc ${REMOTEIP//[\[\]]/} ${TSST_PORT}"
|
||||
tcmd="nc ${WSREP_SST_OPT_HOST_UNESCAPED} ${TSST_PORT}"
|
||||
fi
|
||||
else
|
||||
tfmt='socat'
|
||||
|
|
@ -349,7 +336,7 @@ get_transfer()
|
|||
tcmd="socat -u openssl-listen:${TSST_PORT},reuseaddr,cert=${tcert},cafile=${tca}${joiner_extra}${sockopt} stdio"
|
||||
else
|
||||
wsrep_log_info "Encrypting with CERT: $tcert, CA: $tca"
|
||||
tcmd="socat -u stdio openssl-connect:${REMOTEIP}:${TSST_PORT},cert=${tcert},cafile=${tca}${donor_extra}${sockopt}"
|
||||
tcmd="socat -u stdio openssl-connect:${WSREP_SST_OPT_HOST}:${TSST_PORT},cert=${tcert},cafile=${tca}${donor_extra}${sockopt}"
|
||||
fi
|
||||
elif [[ $encrypt -eq 3 ]];then
|
||||
wsrep_log_warning "**** WARNING **** encrypt=3 is deprecated and will be removed in a future release"
|
||||
|
|
@ -366,7 +353,7 @@ get_transfer()
|
|||
tcmd="socat -u openssl-listen:${TSST_PORT},reuseaddr,cert=${tcert},key=${tkey},verify=0${joiner_extra}${sockopt} stdio"
|
||||
else
|
||||
wsrep_log_info "Encrypting with CERT: $tcert, KEY: $tkey"
|
||||
tcmd="socat -u stdio openssl-connect:${REMOTEIP}:${TSST_PORT},cert=${tcert},key=${tkey},verify=0${sockopt}"
|
||||
tcmd="socat -u stdio openssl-connect:${WSREP_SST_OPT_HOST}:${TSST_PORT},cert=${tcert},key=${tkey},verify=0${sockopt}"
|
||||
fi
|
||||
elif [[ $encrypt -eq 4 ]]; then
|
||||
wsrep_log_info "Using openssl based encryption with socat: with key, crt, and ca"
|
||||
|
|
@ -387,7 +374,7 @@ get_transfer()
|
|||
tcmd="socat -u openssl-listen:${TSST_PORT},reuseaddr,cert=${ssl_cert},key=${ssl_key},cafile=${ssl_ca},verify=1${joiner_extra}${sockopt} stdio"
|
||||
else
|
||||
wsrep_log_info "Encrypting with CERT: $ssl_cert, KEY: $ssl_key, CA: $ssl_ca"
|
||||
tcmd="socat -u stdio openssl-connect:${REMOTEIP}:${TSST_PORT},cert=${ssl_cert},key=${ssl_key},cafile=${ssl_ca},verify=1${donor_extra}${sockopt}"
|
||||
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}"
|
||||
fi
|
||||
|
||||
else
|
||||
|
|
@ -398,7 +385,7 @@ get_transfer()
|
|||
if [[ "$WSREP_SST_OPT_ROLE" == "joiner" ]]; then
|
||||
tcmd="socat -u TCP-LISTEN:${TSST_PORT},reuseaddr${sockopt} stdio"
|
||||
else
|
||||
tcmd="socat -u stdio TCP:${REMOTEIP}:${TSST_PORT}${sockopt}"
|
||||
tcmd="socat -u stdio TCP:${WSREP_SST_OPT_HOST}:${TSST_PORT}${sockopt}"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
|
@ -407,7 +394,7 @@ get_transfer()
|
|||
get_footprint()
|
||||
{
|
||||
pushd $WSREP_SST_OPT_DATA 1>/dev/null
|
||||
payload=$(find . -regex '.*\.ibd$\|.*\.MYI$\|.*\.MYD$\|.*ibdata1$' -type f -print0 | du --files0-from=- --block-size=1 -c | awk 'END { print $1 }')
|
||||
payload=$(find . -regex '.*\.ibd$\|.*\.MYI$\|.*\.MYD$\|.*ibdata1$' -type f -print0 | du --files0-from=- --block-size=1 -c -s | awk 'END { print $1 }')
|
||||
if $MY_PRINT_DEFAULTS xtrabackup | grep -q -- "--compress";then
|
||||
# QuickLZ has around 50% compression ratio
|
||||
# When compression/compaction used, the progress is only an approximate.
|
||||
|
|
@ -481,15 +468,15 @@ read_cnf()
|
|||
# Pull the parameters needed for encrypt=4
|
||||
ssl_ca=$(parse_cnf sst ssl-ca "")
|
||||
if [[ -z "$ssl_ca" ]]; then
|
||||
ssl_ca=$(parse_cnf mysqld ssl-ca "")
|
||||
ssl_ca=$(parse_cnf --mysqld ssl-ca "")
|
||||
fi
|
||||
ssl_cert=$(parse_cnf sst ssl-cert "")
|
||||
if [[ -z "$ssl_cert" ]]; then
|
||||
ssl_cert=$(parse_cnf mysqld ssl-cert "")
|
||||
ssl_cert=$(parse_cnf --mysqld ssl-cert "")
|
||||
fi
|
||||
ssl_key=$(parse_cnf sst ssl-key "")
|
||||
if [[ -z "$ssl_key" ]]; then
|
||||
ssl_key=$(parse_cnf mysqld ssl-key "")
|
||||
ssl_key=$(parse_cnf --mysqld ssl-key "")
|
||||
fi
|
||||
|
||||
rlimit=$(parse_cnf sst rlimit "")
|
||||
|
|
@ -503,7 +490,7 @@ read_cnf()
|
|||
ssystag+="-"
|
||||
|
||||
if [[ $ssyslog -ne -1 ]];then
|
||||
if $MY_PRINT_DEFAULTS mysqld_safe | tr '_' '-' | grep -q -- "--syslog";then
|
||||
if $MY_PRINT_DEFAULTS mysqld_safe | grep -q -- "--syslog";then
|
||||
ssyslog=1
|
||||
fi
|
||||
fi
|
||||
|
|
@ -646,18 +633,6 @@ kill_xtrabackup()
|
|||
rm -f "$XTRABACKUP_PID" || true
|
||||
}
|
||||
|
||||
setup_ports()
|
||||
{
|
||||
if [[ "$WSREP_SST_OPT_ROLE" == "donor" ]];then
|
||||
SST_PORT=$WSREP_SST_OPT_PORT
|
||||
REMOTEIP=$WSREP_SST_OPT_HOST
|
||||
lsn=$(echo $WSREP_SST_OPT_PATH | awk -F '[/]' '{ print $2 }')
|
||||
sst_ver=$(echo $WSREP_SST_OPT_PATH | awk -F '[/]' '{ print $3 }')
|
||||
else
|
||||
SST_PORT=$WSREP_SST_OPT_PORT
|
||||
fi
|
||||
}
|
||||
|
||||
# waits ~1 minute for nc/socat to open the port and then reports ready
|
||||
# (regardless of timeout)
|
||||
wait_for_listen()
|
||||
|
|
@ -674,15 +649,15 @@ wait_for_listen()
|
|||
sleep 0.2
|
||||
done
|
||||
|
||||
echo "ready ${HOST}:${PORT}/${MODULE}//$sst_ver"
|
||||
echo "ready ${HOST}:${PORT}/${MODULE}//${WSREP_SST_OPT_SST_VER:-1}"
|
||||
}
|
||||
|
||||
check_extra()
|
||||
{
|
||||
local use_socket=1
|
||||
if [[ $uextra -eq 1 ]];then
|
||||
if $MY_PRINT_DEFAULTS --mysqld | tr '_' '-' | grep -- "--thread-handling=" | grep -q 'pool-of-threads';then
|
||||
local eport=$($MY_PRINT_DEFAULTS mysqld | tr '_' '-' | grep -- "--extra-port=" | cut -d= -f2)
|
||||
if [ $(parse_cnf --mysqld thread-handling) = 'pool-of-threads'];then
|
||||
local eport=$(parse_cnf --mysqld extra-port)
|
||||
if [[ -n $eport ]];then
|
||||
# Xtrabackup works only locally.
|
||||
# Hence, setting host to 127.0.0.1 unconditionally.
|
||||
|
|
@ -843,7 +818,6 @@ if [[ ! ${WSREP_SST_OPT_ROLE} == 'joiner' && ! ${WSREP_SST_OPT_ROLE} == 'donor'
|
|||
fi
|
||||
|
||||
read_cnf
|
||||
setup_ports
|
||||
|
||||
if ${INNOBACKUPEX_BIN} /tmp --help 2>/dev/null | grep -q -- '--version-check'; then
|
||||
disver="--no-version-check"
|
||||
|
|
@ -877,20 +851,24 @@ if [[ $ssyslog -eq 1 ]];then
|
|||
logger -p daemon.info -t ${ssystag}wsrep-sst-$WSREP_SST_OPT_ROLE "$@"
|
||||
}
|
||||
|
||||
INNOAPPLY="${INNOBACKUPEX_BIN} $disver $iapts --apply-log \$rebuildcmd \${DATA} 2>&1 | logger -p daemon.err -t ${ssystag}innobackupex-apply "
|
||||
INNOMOVE="${INNOBACKUPEX_BIN} ${WSREP_SST_OPT_DEFAULT} $disver $impts --datadir=${DATA} --move-back --force-non-empty-directories \${DATA} 2>&1 | logger -p daemon.err -t ${ssystag}innobackupex-move "
|
||||
INNOBACKUP="${INNOBACKUPEX_BIN} ${WSREP_SST_OPT_DEFAULT} $disver $iopts \$tmpopts \$INNOEXTRA --galera-info --stream=\$sfmt \$itmpdir 2> >(logger -p daemon.err -t ${ssystag}innobackupex-backup)"
|
||||
INNOAPPLY="2>&1 | logger -p daemon.err -t ${ssystag}innobackupex-apply "
|
||||
INNOMOVE="2>&1 | logger -p daemon.err -t ${ssystag}innobackupex-move "
|
||||
INNOBACKUP="2> >(logger -p daemon.err -t ${ssystag}innobackupex-backup)"
|
||||
fi
|
||||
|
||||
else
|
||||
INNOAPPLY="${INNOBACKUPEX_BIN} $disver $iapts --apply-log \$rebuildcmd \${DATA} &>\${DATA}/innobackup.prepare.log"
|
||||
INNOMOVE="${INNOBACKUPEX_BIN} ${WSREP_SST_OPT_DEFAULT} --defaults-group=mysqld${WSREP_SST_OPT_CONF_SUFFIX} $disver $impts --datadir=${DATA} --move-back --force-non-empty-directories \${DATA} &>\${DATA}/innobackup.move.log"
|
||||
INNOBACKUP="${INNOBACKUPEX_BIN} ${WSREP_SST_OPT_DEFAULT} $disver $iopts \$tmpopts \$INNOEXTRA --galera-info --stream=\$sfmt \$itmpdir 2>\${DATA}/innobackup.backup.log"
|
||||
INNOAPPLY="&>\${DATA}/innobackup.prepare.log"
|
||||
INNOMOVE="&>\${DATA}/innobackup.move.log"
|
||||
INNOBACKUP="2>\${DATA}/innobackup.backup.log"
|
||||
fi
|
||||
|
||||
get_stream
|
||||
get_transfer
|
||||
|
||||
INNOAPPLY="${INNOBACKUPEX_BIN} $disver $iapts --apply-log \$rebuildcmd \${DATA} ${INNOAPPLY}"
|
||||
INNOMOVE="${INNOBACKUPEX_BIN} ${WSREP_SST_OPT_CONF} $disver $impts --move-back --force-non-empty-directories \${DATA} ${INNOMOVE}"
|
||||
INNOBACKUP="${INNOBACKUPEX_BIN} ${WSREP_SST_OPT_CONF} $disver $iopts \$tmpopts \$INNOEXTRA --galera-info --stream=\$sfmt \$itmpdir ${INNOBACKUP}"
|
||||
|
||||
if [ "$WSREP_SST_OPT_ROLE" = "donor" ]
|
||||
then
|
||||
trap cleanup_donor EXIT
|
||||
|
|
@ -898,13 +876,13 @@ then
|
|||
if [ $WSREP_SST_OPT_BYPASS -eq 0 ]
|
||||
then
|
||||
usrst=0
|
||||
if [[ -z $sst_ver ]];then
|
||||
if [[ -z $WSREP_SST_OPT_SST_VER ]];then
|
||||
wsrep_log_error "Upgrade joiner to 5.6.21 or higher for backup locks support"
|
||||
wsrep_log_error "The joiner is not supported for this version of donor"
|
||||
exit 93
|
||||
fi
|
||||
|
||||
if [[ -z $(parse_cnf mysqld tmpdir "") && -z $(parse_cnf xtrabackup tmpdir "") ]];then
|
||||
if [[ -z $(parse_cnf --mysqld tmpdir "") && -z $(parse_cnf xtrabackup tmpdir "") ]];then
|
||||
xtmpdir=$(mktemp -d)
|
||||
tmpopts=" --tmpdir=$xtmpdir "
|
||||
wsrep_log_info "Using $xtmpdir as xtrabackup temporary directory"
|
||||
|
|
@ -961,7 +939,7 @@ then
|
|||
wsrep_log_info "Sleeping before data transfer for SST"
|
||||
sleep 10
|
||||
|
||||
wsrep_log_info "Streaming the backup to joiner at ${REMOTEIP} ${SST_PORT:-4444}"
|
||||
wsrep_log_info "Streaming the backup to joiner at ${WSREP_SST_OPT_HOST} ${WSREP_SST_OPT_PORT:-4444}"
|
||||
|
||||
# Add compression to the head of the stream (if specified)
|
||||
if [[ -n $scomp ]]; then
|
||||
|
|
@ -1023,9 +1001,9 @@ then
|
|||
[[ -e $SST_PROGRESS_FILE ]] && wsrep_log_info "Stale sst_in_progress file: $SST_PROGRESS_FILE"
|
||||
[[ -n $SST_PROGRESS_FILE ]] && touch $SST_PROGRESS_FILE
|
||||
|
||||
ib_home_dir=$(parse_cnf mysqld innodb-data-home-dir "")
|
||||
ib_log_dir=$(parse_cnf mysqld innodb-log-group-home-dir "")
|
||||
ib_undo_dir=$(parse_cnf mysqld innodb-undo-directory "")
|
||||
ib_home_dir=$(parse_cnf --mysqld innodb-data-home-dir "")
|
||||
ib_log_dir=$(parse_cnf --mysqld innodb-log-group-home-dir "")
|
||||
ib_undo_dir=$(parse_cnf --mysqld innodb-undo-directory "")
|
||||
|
||||
stagemsg="Joiner-Recv"
|
||||
|
||||
|
|
@ -1091,7 +1069,7 @@ then
|
|||
find $ib_home_dir $ib_log_dir $ib_undo_dir $DATA -mindepth 1 -prune -regex $cpat -o -exec rm -rfv {} 1>&2 \+
|
||||
fi
|
||||
|
||||
tempdir=$(parse_cnf mysqld log-bin "")
|
||||
tempdir=$(parse_cnf --mysqld log-bin "")
|
||||
if [[ -n ${tempdir:-} ]];then
|
||||
binlog_dir=$(dirname $tempdir)
|
||||
binlog_file=$(basename $tempdir)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue