mirror of
https://github.com/MariaDB/server.git
synced 2025-07-26 07:02:12 +03:00
correct handling on defaults[-extra]-file is SST scripts
pass --defaults-file and --defaults-extra-file (whatever was specified, or none) from mysqld down to SST scripts. parse these options in SST scripts and pass them down to mysqldump, my_print_defaults, and xtrabackup
This commit is contained in:
@ -88,12 +88,6 @@ static char my_defaults_extra_file_buffer[FN_REFLEN];
|
|||||||
|
|
||||||
static my_bool defaults_already_read= FALSE;
|
static my_bool defaults_already_read= FALSE;
|
||||||
|
|
||||||
#ifdef WITH_WSREP
|
|
||||||
/* The only purpose of this global array is to hold full name of my.cnf
|
|
||||||
* which seems to be otherwise unavailable */
|
|
||||||
char wsrep_defaults_file[FN_REFLEN + 10]={0,};
|
|
||||||
#endif /* WITH_WREP */
|
|
||||||
|
|
||||||
/* Which directories are searched for options (and in which order) */
|
/* Which directories are searched for options (and in which order) */
|
||||||
|
|
||||||
#define MAX_DEFAULT_DIRS 6
|
#define MAX_DEFAULT_DIRS 6
|
||||||
@ -810,12 +804,6 @@ static int search_default_file_with_ext(Process_option_func opt_handler,
|
|||||||
if (!(fp= mysql_file_fopen(key_file_cnf, name, O_RDONLY, MYF(0))))
|
if (!(fp= mysql_file_fopen(key_file_cnf, name, O_RDONLY, MYF(0))))
|
||||||
return 1; /* Ignore wrong files */
|
return 1; /* Ignore wrong files */
|
||||||
|
|
||||||
#ifdef WITH_WSREP
|
|
||||||
/* make sure we do this only once - for top-level file */
|
|
||||||
if ('\0' == wsrep_defaults_file[0])
|
|
||||||
strmake(wsrep_defaults_file, name, sizeof(wsrep_defaults_file) - 1);
|
|
||||||
#endif /* WITH_WSREP */
|
|
||||||
|
|
||||||
while (mysql_file_fgets(buff, sizeof(buff) - 1, fp))
|
while (mysql_file_fgets(buff, sizeof(buff) - 1, fp))
|
||||||
{
|
{
|
||||||
line++;
|
line++;
|
||||||
|
@ -22,6 +22,9 @@ WSREP_SST_OPT_BYPASS=0
|
|||||||
WSREP_SST_OPT_BINLOG=""
|
WSREP_SST_OPT_BINLOG=""
|
||||||
WSREP_SST_OPT_DATA=""
|
WSREP_SST_OPT_DATA=""
|
||||||
WSREP_SST_OPT_AUTH=""
|
WSREP_SST_OPT_AUTH=""
|
||||||
|
WSREP_SST_OPT_DEFAULT=""
|
||||||
|
WSREP_SST_OPT_EXTRA_DEFAULT=""
|
||||||
|
|
||||||
|
|
||||||
while [ $# -gt 0 ]; do
|
while [ $# -gt 0 ]; do
|
||||||
case "$1" in
|
case "$1" in
|
||||||
@ -41,7 +44,11 @@ case "$1" in
|
|||||||
shift
|
shift
|
||||||
;;
|
;;
|
||||||
'--defaults-file')
|
'--defaults-file')
|
||||||
readonly WSREP_SST_OPT_CONF="$2"
|
readonly WSREP_SST_OPT_DEFAULT="$1=$2"
|
||||||
|
shift
|
||||||
|
;;
|
||||||
|
'--defaults-extra-file')
|
||||||
|
readonly WSREP_SST_OPT_EXTRA_DEFAULT="$1=$2"
|
||||||
shift
|
shift
|
||||||
;;
|
;;
|
||||||
'--host')
|
'--host')
|
||||||
@ -94,10 +101,13 @@ done
|
|||||||
readonly WSREP_SST_OPT_BYPASS
|
readonly WSREP_SST_OPT_BYPASS
|
||||||
readonly WSREP_SST_OPT_BINLOG
|
readonly WSREP_SST_OPT_BINLOG
|
||||||
|
|
||||||
|
readonly WSREP_SST_OPT_CONF="$WSREP_SST_OPT_DEFAULT $WSREP_SST_OPT_EXTRA_DEFAULT"
|
||||||
|
readonly my_print_defaults="my_print_defaults $WSREP_SST_OPT_CONF"
|
||||||
|
|
||||||
# State Snapshot Transfer authentication password was displayed in the ps output. Bug fixed #1200727.
|
# State Snapshot Transfer authentication password was displayed in the ps output. Bug fixed #1200727.
|
||||||
if my_print_defaults -c $WSREP_SST_OPT_CONF sst | grep -q "wsrep_sst_auth";then
|
if $my_print_defaults sst | grep -q "wsrep_sst_auth";then
|
||||||
if [ -z "$WSREP_SST_OPT_AUTH" -o "$WSREP_SST_OPT_AUTH" = "(null)" ];then
|
if [ -z "$WSREP_SST_OPT_AUTH" -o "$WSREP_SST_OPT_AUTH" = "(null)" ];then
|
||||||
WSREP_SST_OPT_AUTH=$(my_print_defaults -c $WSREP_SST_OPT_CONF sst | grep -- "--wsrep_sst_auth" | cut -d= -f2)
|
WSREP_SST_OPT_AUTH=$($my_print_defaults sst | grep -- "--wsrep_sst_auth" | cut -d= -f2)
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -17,10 +17,6 @@
|
|||||||
|
|
||||||
# This is a reference script for mysqldump-based state snapshot tansfer
|
# This is a reference script for mysqldump-based state snapshot tansfer
|
||||||
|
|
||||||
# This variable is not used in mysqldump sst, so better initialize it
|
|
||||||
# to avoid shell's "parameter not set" message.
|
|
||||||
WSREP_SST_OPT_CONF=""
|
|
||||||
|
|
||||||
. $(dirname $0)/wsrep_sst_common
|
. $(dirname $0)/wsrep_sst_common
|
||||||
|
|
||||||
EINVAL=22
|
EINVAL=22
|
||||||
|
@ -92,9 +92,7 @@ fi
|
|||||||
WSREP_LOG_DIR=${WSREP_LOG_DIR:-""}
|
WSREP_LOG_DIR=${WSREP_LOG_DIR:-""}
|
||||||
# if WSREP_LOG_DIR env. variable is not set, try to get it from my.cnf
|
# if WSREP_LOG_DIR env. variable is not set, try to get it from my.cnf
|
||||||
if [ -z "$WSREP_LOG_DIR" ]; then
|
if [ -z "$WSREP_LOG_DIR" ]; then
|
||||||
SCRIPT_DIR="$(cd $(dirname "$0"); pwd -P)"
|
WSREP_LOG_DIR=$($my_print_defaults --mysqld \
|
||||||
WSREP_LOG_DIR=$($SCRIPT_DIR/my_print_defaults --defaults-file \
|
|
||||||
"$WSREP_SST_OPT_CONF" mysqld server mysqld-10.0 mariadb mariadb-10.0 \
|
|
||||||
| grep -- '--innodb[-_]log[-_]group[-_]home[-_]dir=' \
|
| grep -- '--innodb[-_]log[-_]group[-_]home[-_]dir=' \
|
||||||
| cut -b 29- )
|
| cut -b 29- )
|
||||||
fi
|
fi
|
||||||
|
@ -117,7 +117,7 @@ get_keys()
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ $encrypt -eq 0 ]];then
|
if [[ $encrypt -eq 0 ]];then
|
||||||
if my_print_defaults -c $WSREP_SST_OPT_CONF xtrabackup | grep -q encrypt;then
|
if $my_print_defaults xtrabackup | grep -q encrypt;then
|
||||||
wsrep_log_error "Unexpected option combination. SST may fail. Refer to http://www.percona.com/doc/percona-xtradb-cluster/manual/xtrabackup_sst.html "
|
wsrep_log_error "Unexpected option combination. SST may fail. Refer to http://www.percona.com/doc/percona-xtradb-cluster/manual/xtrabackup_sst.html "
|
||||||
fi
|
fi
|
||||||
return
|
return
|
||||||
@ -230,7 +230,7 @@ parse_cnf()
|
|||||||
{
|
{
|
||||||
local group=$1
|
local group=$1
|
||||||
local var=$2
|
local var=$2
|
||||||
reval=$(my_print_defaults -c $WSREP_SST_OPT_CONF $group | awk -F= '{if ($1 ~ /_/) { gsub(/_/,"-",$1); print $1"="$2 } else { print $0 }}' | grep -- "--$var=" | cut -d= -f2-)
|
reval=$($my_print_defaults $group | awk -F= '{if ($1 ~ /_/) { gsub(/_/,"-",$1); print $1"="$2 } else { print $0 }}' | grep -- "--$var=" | cut -d= -f2-)
|
||||||
if [[ -z $reval ]];then
|
if [[ -z $reval ]];then
|
||||||
[[ -n $3 ]] && reval=$3
|
[[ -n $3 ]] && reval=$3
|
||||||
fi
|
fi
|
||||||
@ -241,7 +241,7 @@ get_footprint()
|
|||||||
{
|
{
|
||||||
pushd $WSREP_SST_OPT_DATA 1>/dev/null
|
pushd $WSREP_SST_OPT_DATA 1>/dev/null
|
||||||
payload=$(find . -regex '.*\.ibd$\|.*\.MYI$\|.*\.MYD$\|.*ibdata1$' -type f -print0 | xargs -0 du --block-size=1 -c | awk 'END { print $1 }')
|
payload=$(find . -regex '.*\.ibd$\|.*\.MYI$\|.*\.MYD$\|.*ibdata1$' -type f -print0 | xargs -0 du --block-size=1 -c | awk 'END { print $1 }')
|
||||||
if my_print_defaults -c $WSREP_SST_OPT_CONF xtrabackup | grep -q -- "--compress";then
|
if $my_print_defaults xtrabackup | grep -q -- "--compress";then
|
||||||
# QuickLZ has around 50% compression ratio
|
# QuickLZ has around 50% compression ratio
|
||||||
# When compression/compaction used, the progress is only an approximate.
|
# When compression/compaction used, the progress is only an approximate.
|
||||||
payload=$(( payload*1/2 ))
|
payload=$(( payload*1/2 ))
|
||||||
@ -443,8 +443,8 @@ check_extra()
|
|||||||
{
|
{
|
||||||
local use_socket=1
|
local use_socket=1
|
||||||
if [[ $uextra -eq 1 ]];then
|
if [[ $uextra -eq 1 ]];then
|
||||||
if my_print_defaults -c $WSREP_SST_OPT_CONF mysqld | tr '_' '-' | grep -- "--thread-handling=" | grep -q 'pool-of-threads';then
|
if $my_print_defaults --mysqld | tr '_' '-' | grep -- "--thread-handling=" | grep -q 'pool-of-threads';then
|
||||||
local eport=$(my_print_defaults -c $WSREP_SST_OPT_CONF mysqld | tr '_' '-' | grep -- "--extra-port=" | cut -d= -f2)
|
local eport=$($my_print_defaults --mysqld | tr '_' '-' | grep -- "--extra-port=" | cut -d= -f2)
|
||||||
if [[ -n $eport ]];then
|
if [[ -n $eport ]];then
|
||||||
# Xtrabackup works only locally.
|
# Xtrabackup works only locally.
|
||||||
# Hence, setting host to 127.0.0.1 unconditionally.
|
# Hence, setting host to 127.0.0.1 unconditionally.
|
||||||
@ -557,8 +557,8 @@ fi
|
|||||||
|
|
||||||
INNOEXTRA=""
|
INNOEXTRA=""
|
||||||
INNOAPPLY="${INNOBACKUPEX_BIN} $disver $iapts --apply-log \$rebuildcmd \${DATA} &>\${DATA}/innobackup.prepare.log"
|
INNOAPPLY="${INNOBACKUPEX_BIN} $disver $iapts --apply-log \$rebuildcmd \${DATA} &>\${DATA}/innobackup.prepare.log"
|
||||||
INNOMOVE="${INNOBACKUPEX_BIN} --defaults-file=${WSREP_SST_OPT_CONF} $disver $impts --move-back --force-non-empty-directories \${DATA} &>\${DATA}/innobackup.move.log"
|
INNOMOVE="${INNOBACKUPEX_BIN} ${WSREP_SST_OPT_CONF} $disver $impts --move-back --force-non-empty-directories \${DATA} &>\${DATA}/innobackup.move.log"
|
||||||
INNOBACKUP="${INNOBACKUPEX_BIN} --defaults-file=${WSREP_SST_OPT_CONF} $disver $iopts \$tmpopts \$INNOEXTRA --galera-info --stream=\$sfmt \$itmpdir 2>\${DATA}/innobackup.backup.log"
|
INNOBACKUP="${INNOBACKUPEX_BIN} ${WSREP_SST_OPT_CONF} $disver $iopts \$tmpopts \$INNOEXTRA --galera-info --stream=\$sfmt \$itmpdir 2>\${DATA}/innobackup.backup.log"
|
||||||
|
|
||||||
if [ "$WSREP_SST_OPT_ROLE" = "donor" ]
|
if [ "$WSREP_SST_OPT_ROLE" = "donor" ]
|
||||||
then
|
then
|
||||||
@ -879,7 +879,7 @@ then
|
|||||||
|
|
||||||
if [[ $incremental -eq 1 ]];then
|
if [[ $incremental -eq 1 ]];then
|
||||||
# Added --ibbackup=xtrabackup_55 because it fails otherwise citing connection issues.
|
# Added --ibbackup=xtrabackup_55 because it fails otherwise citing connection issues.
|
||||||
INNOAPPLY="${INNOBACKUPEX_BIN} $disver --defaults-file=${WSREP_SST_OPT_CONF} \
|
INNOAPPLY="${INNOBACKUPEX_BIN} $disver ${WSREP_SST_OPT_CONF} \
|
||||||
--ibbackup=xtrabackup_56 --apply-log $rebuildcmd --redo-only $BDATA --incremental-dir=${DATA} &>>${BDATA}/innobackup.prepare.log"
|
--ibbackup=xtrabackup_56 --apply-log $rebuildcmd --redo-only $BDATA --incremental-dir=${DATA} &>>${BDATA}/innobackup.prepare.log"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -100,7 +100,7 @@ get_keys()
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ $encrypt -eq 0 ]];then
|
if [[ $encrypt -eq 0 ]];then
|
||||||
if my_print_defaults -c $WSREP_SST_OPT_CONF xtrabackup | grep -q encrypt;then
|
if $my_print_defaults xtrabackup | grep -q encrypt;then
|
||||||
wsrep_log_error "Unexpected option combination. SST may fail. Refer to http://www.percona.com/doc/percona-xtradb-cluster/manual/xtrabackup_sst.html "
|
wsrep_log_error "Unexpected option combination. SST may fail. Refer to http://www.percona.com/doc/percona-xtradb-cluster/manual/xtrabackup_sst.html "
|
||||||
fi
|
fi
|
||||||
return
|
return
|
||||||
@ -195,7 +195,7 @@ parse_cnf()
|
|||||||
{
|
{
|
||||||
local group=$1
|
local group=$1
|
||||||
local var=$2
|
local var=$2
|
||||||
reval=$(my_print_defaults -c $WSREP_SST_OPT_CONF $group | awk -F= '{if ($1 ~ /_/) { gsub(/_/,"-",$1); print $1"="$2 } else { print $0 }}' | grep -- "--$var=" | cut -d= -f2-)
|
reval=$($my_print_defaults $group | awk -F= '{if ($1 ~ /_/) { gsub(/_/,"-",$1); print $1"="$2 } else { print $0 }}' | grep -- "--$var=" | cut -d= -f2-)
|
||||||
if [[ -z $reval ]];then
|
if [[ -z $reval ]];then
|
||||||
[[ -n $3 ]] && reval=$3
|
[[ -n $3 ]] && reval=$3
|
||||||
fi
|
fi
|
||||||
@ -206,7 +206,7 @@ get_footprint()
|
|||||||
{
|
{
|
||||||
pushd $WSREP_SST_OPT_DATA 1>/dev/null
|
pushd $WSREP_SST_OPT_DATA 1>/dev/null
|
||||||
payload=$(find . -regex '.*\.ibd$\|.*\.MYI$\|.*\.MYD$\|.*ibdata1$' -type f -print0 | xargs -0 du --block-size=1 -c | awk 'END { print $1 }')
|
payload=$(find . -regex '.*\.ibd$\|.*\.MYI$\|.*\.MYD$\|.*ibdata1$' -type f -print0 | xargs -0 du --block-size=1 -c | awk 'END { print $1 }')
|
||||||
if my_print_defaults -c $WSREP_SST_OPT_CONF xtrabackup | grep -q -- "--compress";then
|
if $my_print_defaults xtrabackup | grep -q -- "--compress";then
|
||||||
# QuickLZ has around 50% compression ratio
|
# QuickLZ has around 50% compression ratio
|
||||||
# When compression/compaction used, the progress is only an approximate.
|
# When compression/compaction used, the progress is only an approximate.
|
||||||
payload=$(( payload*1/2 ))
|
payload=$(( payload*1/2 ))
|
||||||
@ -385,8 +385,8 @@ check_extra()
|
|||||||
{
|
{
|
||||||
local use_socket=1
|
local use_socket=1
|
||||||
if [[ $uextra -eq 1 ]];then
|
if [[ $uextra -eq 1 ]];then
|
||||||
if my_print_defaults -c $WSREP_SST_OPT_CONF mysqld | tr '_' '-' | grep -- "--thread-handling=" | grep -q 'pool-of-threads';then
|
if $my_print_defaults --mysqld | tr '_' '-' | grep -- "--thread-handling=" | grep -q 'pool-of-threads';then
|
||||||
local eport=$(my_print_defaults -c $WSREP_SST_OPT_CONF mysqld | tr '_' '-' | grep -- "--extra-port=" | cut -d= -f2)
|
local eport=$($my_print_defaults --mysqld | tr '_' '-' | grep -- "--extra-port=" | cut -d= -f2)
|
||||||
if [[ -n $eport ]];then
|
if [[ -n $eport ]];then
|
||||||
# Xtrabackup works only locally.
|
# Xtrabackup works only locally.
|
||||||
# Hence, setting host to 127.0.0.1 unconditionally.
|
# Hence, setting host to 127.0.0.1 unconditionally.
|
||||||
@ -424,8 +424,8 @@ get_stream
|
|||||||
get_transfer
|
get_transfer
|
||||||
|
|
||||||
INNOEXTRA=""
|
INNOEXTRA=""
|
||||||
INNOAPPLY="${INNOBACKUPEX_BIN} --defaults-file=${WSREP_SST_OPT_CONF} --apply-log \$rebuildcmd \${DATA} &>\${DATA}/innobackup.prepare.log"
|
INNOAPPLY="${INNOBACKUPEX_BIN} ${WSREP_SST_OPT_CONF} --apply-log \$rebuildcmd \${DATA} &>\${DATA}/innobackup.prepare.log"
|
||||||
INNOBACKUP="${INNOBACKUPEX_BIN} --defaults-file=${WSREP_SST_OPT_CONF} \$INNOEXTRA --galera-info --stream=\$sfmt \${TMPDIR} 2>\${DATA}/innobackup.backup.log"
|
INNOBACKUP="${INNOBACKUPEX_BIN} ${WSREP_SST_OPT_CONF} \$INNOEXTRA --galera-info --stream=\$sfmt \${TMPDIR} 2>\${DATA}/innobackup.backup.log"
|
||||||
|
|
||||||
if [ "$WSREP_SST_OPT_ROLE" = "donor" ]
|
if [ "$WSREP_SST_OPT_ROLE" = "donor" ]
|
||||||
then
|
then
|
||||||
@ -528,7 +528,7 @@ then
|
|||||||
|
|
||||||
if [[ $incremental -eq 1 ]];then
|
if [[ $incremental -eq 1 ]];then
|
||||||
wsrep_log_info "Incremental SST enabled"
|
wsrep_log_info "Incremental SST enabled"
|
||||||
#lsn=$(/pxc/bin/mysqld --defaults-file=$WSREP_SST_OPT_CONF --basedir=/pxc --wsrep-recover 2>&1 | grep -o 'log sequence number .*' | cut -d " " -f 4 | head -1)
|
#lsn=$(/pxc/bin/mysqld $WSREP_SST_OPT_CONF --basedir=/pxc --wsrep-recover 2>&1 | grep -o 'log sequence number .*' | cut -d " " -f 4 | head -1)
|
||||||
lsn=$(grep to_lsn xtrabackup_checkpoints | cut -d= -f2 | tr -d ' ')
|
lsn=$(grep to_lsn xtrabackup_checkpoints | cut -d= -f2 | tr -d ' ')
|
||||||
wsrep_log_info "Recovered LSN: $lsn"
|
wsrep_log_info "Recovered LSN: $lsn"
|
||||||
fi
|
fi
|
||||||
@ -681,7 +681,7 @@ then
|
|||||||
|
|
||||||
if [[ $incremental -eq 1 ]];then
|
if [[ $incremental -eq 1 ]];then
|
||||||
# Added --ibbackup=xtrabackup_55 because it fails otherwise citing connection issues.
|
# Added --ibbackup=xtrabackup_55 because it fails otherwise citing connection issues.
|
||||||
INNOAPPLY="${INNOBACKUPEX_BIN} --defaults-file=${WSREP_SST_OPT_CONF} \
|
INNOAPPLY="${INNOBACKUPEX_BIN} ${WSREP_SST_OPT_CONF} \
|
||||||
--ibbackup=xtrabackup_55 --apply-log $rebuildcmd --redo-only $BDATA --incremental-dir=${DATA} &>>${BDATA}/innobackup.prepare.log"
|
--ibbackup=xtrabackup_55 --apply-log $rebuildcmd --redo-only $BDATA --incremental-dir=${DATA} &>>${BDATA}/innobackup.prepare.log"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -29,7 +29,9 @@
|
|||||||
#include <cstdio>
|
#include <cstdio>
|
||||||
#include <cstdlib>
|
#include <cstdlib>
|
||||||
|
|
||||||
extern const char wsrep_defaults_file[];
|
char wsrep_defaults_file[FN_REFLEN * 2 + 10 +
|
||||||
|
sizeof(WSREP_SST_OPT_CONF) +
|
||||||
|
sizeof(WSREP_SST_OPT_EXTRA_CONF)] = {0};
|
||||||
|
|
||||||
const char* wsrep_sst_method = WSREP_SST_DEFAULT;
|
const char* wsrep_sst_method = WSREP_SST_DEFAULT;
|
||||||
const char* wsrep_sst_receive_address = WSREP_SST_ADDRESS_AUTO;
|
const char* wsrep_sst_receive_address = WSREP_SST_ADDRESS_AUTO;
|
||||||
@ -59,6 +61,24 @@ bool wsrep_sst_method_update (sys_var *self, THD* thd, enum_var_type type)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static void make_wsrep_defaults_file()
|
||||||
|
{
|
||||||
|
if (!wsrep_defaults_file[0])
|
||||||
|
{
|
||||||
|
char *ptr= wsrep_defaults_file;
|
||||||
|
char *end= ptr + sizeof(wsrep_defaults_file);
|
||||||
|
if (my_defaults_file)
|
||||||
|
ptr= strxnmov(ptr, end - ptr,
|
||||||
|
WSREP_SST_OPT_CONF, " '", my_defaults_file, "' ", NULL);
|
||||||
|
|
||||||
|
if (my_defaults_extra_file)
|
||||||
|
ptr= strxnmov(ptr, end - ptr,
|
||||||
|
WSREP_SST_OPT_EXTRA_CONF, " '", my_defaults_extra_file, "' ", NULL);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
// TODO: Improve address verification.
|
// TODO: Improve address verification.
|
||||||
static bool sst_receive_address_check (const char* str)
|
static bool sst_receive_address_check (const char* str)
|
||||||
{
|
{
|
||||||
@ -455,6 +475,7 @@ static ssize_t sst_prepare_other (const char* method,
|
|||||||
}
|
}
|
||||||
if (strlen(binlog_opt_val)) binlog_opt= WSREP_SST_OPT_BINLOG;
|
if (strlen(binlog_opt_val)) binlog_opt= WSREP_SST_OPT_BINLOG;
|
||||||
|
|
||||||
|
make_wsrep_defaults_file();
|
||||||
|
|
||||||
ret= snprintf (cmd_str, cmd_len,
|
ret= snprintf (cmd_str, cmd_len,
|
||||||
"wsrep_sst_%s "
|
"wsrep_sst_%s "
|
||||||
@ -462,7 +483,7 @@ static ssize_t sst_prepare_other (const char* method,
|
|||||||
WSREP_SST_OPT_ADDR" '%s' "
|
WSREP_SST_OPT_ADDR" '%s' "
|
||||||
WSREP_SST_OPT_AUTH" '%s' "
|
WSREP_SST_OPT_AUTH" '%s' "
|
||||||
WSREP_SST_OPT_DATA" '%s' "
|
WSREP_SST_OPT_DATA" '%s' "
|
||||||
WSREP_SST_OPT_CONF" '%s' "
|
" %s "
|
||||||
WSREP_SST_OPT_PARENT" '%d'"
|
WSREP_SST_OPT_PARENT" '%d'"
|
||||||
" %s '%s' ",
|
" %s '%s' ",
|
||||||
method, addr_in, (sst_auth_real) ? sst_auth_real : "",
|
method, addr_in, (sst_auth_real) ? sst_auth_real : "",
|
||||||
@ -754,6 +775,8 @@ static int sst_donate_mysqldump (const char* addr,
|
|||||||
|
|
||||||
if (!bypass && wsrep_sst_donor_rejects_queries) sst_reject_queries(TRUE);
|
if (!bypass && wsrep_sst_donor_rejects_queries) sst_reject_queries(TRUE);
|
||||||
|
|
||||||
|
make_wsrep_defaults_file();
|
||||||
|
|
||||||
snprintf (cmd_str, cmd_len,
|
snprintf (cmd_str, cmd_len,
|
||||||
"wsrep_sst_mysqldump "
|
"wsrep_sst_mysqldump "
|
||||||
WSREP_SST_OPT_USER" '%s' "
|
WSREP_SST_OPT_USER" '%s' "
|
||||||
@ -762,7 +785,7 @@ static int sst_donate_mysqldump (const char* addr,
|
|||||||
WSREP_SST_OPT_PORT" '%s' "
|
WSREP_SST_OPT_PORT" '%s' "
|
||||||
WSREP_SST_OPT_LPORT" '%u' "
|
WSREP_SST_OPT_LPORT" '%u' "
|
||||||
WSREP_SST_OPT_SOCKET" '%s' "
|
WSREP_SST_OPT_SOCKET" '%s' "
|
||||||
WSREP_SST_OPT_CONF" '%s' "
|
" %s "
|
||||||
WSREP_SST_OPT_GTID" '%s:%lld'"
|
WSREP_SST_OPT_GTID" '%s:%lld'"
|
||||||
"%s",
|
"%s",
|
||||||
user, pswd, host, port, mysqld_port, mysqld_unix_port,
|
user, pswd, host, port, mysqld_port, mysqld_unix_port,
|
||||||
@ -1027,6 +1050,8 @@ static int sst_donate_other (const char* method,
|
|||||||
}
|
}
|
||||||
if (strlen(binlog_opt_val)) binlog_opt= WSREP_SST_OPT_BINLOG;
|
if (strlen(binlog_opt_val)) binlog_opt= WSREP_SST_OPT_BINLOG;
|
||||||
|
|
||||||
|
make_wsrep_defaults_file();
|
||||||
|
|
||||||
ret= snprintf (cmd_str, cmd_len,
|
ret= snprintf (cmd_str, cmd_len,
|
||||||
"wsrep_sst_%s "
|
"wsrep_sst_%s "
|
||||||
WSREP_SST_OPT_ROLE" 'donor' "
|
WSREP_SST_OPT_ROLE" 'donor' "
|
||||||
@ -1034,7 +1059,7 @@ static int sst_donate_other (const char* method,
|
|||||||
WSREP_SST_OPT_AUTH" '%s' "
|
WSREP_SST_OPT_AUTH" '%s' "
|
||||||
WSREP_SST_OPT_SOCKET" '%s' "
|
WSREP_SST_OPT_SOCKET" '%s' "
|
||||||
WSREP_SST_OPT_DATA" '%s' "
|
WSREP_SST_OPT_DATA" '%s' "
|
||||||
WSREP_SST_OPT_CONF" '%s' "
|
" %s "
|
||||||
" %s '%s' "
|
" %s '%s' "
|
||||||
WSREP_SST_OPT_GTID" '%s:%lld'"
|
WSREP_SST_OPT_GTID" '%s:%lld'"
|
||||||
"%s",
|
"%s",
|
||||||
|
@ -27,6 +27,7 @@
|
|||||||
#define WSREP_SST_OPT_AUTH "--auth"
|
#define WSREP_SST_OPT_AUTH "--auth"
|
||||||
#define WSREP_SST_OPT_DATA "--datadir"
|
#define WSREP_SST_OPT_DATA "--datadir"
|
||||||
#define WSREP_SST_OPT_CONF "--defaults-file"
|
#define WSREP_SST_OPT_CONF "--defaults-file"
|
||||||
|
#define WSREP_SST_OPT_EXTRA_CONF "--defaults-extra-file"
|
||||||
#define WSREP_SST_OPT_PARENT "--parent"
|
#define WSREP_SST_OPT_PARENT "--parent"
|
||||||
#define WSREP_SST_OPT_BINLOG "--binlog"
|
#define WSREP_SST_OPT_BINLOG "--binlog"
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user