mirror of
https://github.com/MariaDB/server.git
synced 2026-05-15 03:17:20 +02:00
Merge remote-tracking branch 'origin/10.0-galera' into 10.1
This commit is contained in:
commit
c23efc7d50
142 changed files with 2584 additions and 786 deletions
|
|
@ -32,6 +32,22 @@ while [ $# -gt 0 ]; do
|
|||
case "$1" in
|
||||
'--address')
|
||||
readonly WSREP_SST_OPT_ADDR="$2"
|
||||
#
|
||||
# Break address string into host:port/path parts
|
||||
#
|
||||
if echo $WSREP_SST_OPT_ADDR | grep -qe '^\[.*\]'
|
||||
then
|
||||
# IPv6 notation
|
||||
readonly WSREP_SST_OPT_HOST=${WSREP_SST_OPT_ADDR/\]*/\]}
|
||||
readonly WSREP_SST_OPT_HOST_UNESCAPED=$(echo $WSREP_SST_OPT_HOST | \
|
||||
cut -d '[' -f 2 | cut -d ']' -f 1)
|
||||
else
|
||||
# "traditional" notation
|
||||
readonly WSREP_SST_OPT_HOST=${WSREP_SST_OPT_ADDR%%[:/]*}
|
||||
fi
|
||||
readonly WSREP_SST_OPT_PORT=$(echo $WSREP_SST_OPT_ADDR | \
|
||||
cut -d ']' -f 2 | cut -s -d ':' -f 2 | cut -d '/' -f 1)
|
||||
readonly WSREP_SST_OPT_PATH=${WSREP_SST_OPT_ADDR#*/}
|
||||
shift
|
||||
;;
|
||||
'--bypass')
|
||||
|
|
@ -181,6 +197,11 @@ wsrep_log_error()
|
|||
wsrep_log "[ERROR] $*"
|
||||
}
|
||||
|
||||
wsrep_log_warning()
|
||||
{
|
||||
wsrep_log "[WARNING] $*"
|
||||
}
|
||||
|
||||
wsrep_log_info()
|
||||
{
|
||||
wsrep_log "[INFO] $*"
|
||||
|
|
@ -214,3 +235,39 @@ wsrep_check_programs()
|
|||
|
||||
return $ret
|
||||
}
|
||||
|
||||
#
|
||||
# user can specify xtrabackup specific settings that will be used during sst
|
||||
# process like encryption, etc.....
|
||||
# parse such configuration option. (group for xb settings is [sst] in my.cnf
|
||||
#
|
||||
# 1st param: group : name of the config file section, e.g. mysqld
|
||||
# 2nd param: var : name of the variable in the section, e.g. server-id
|
||||
# 3rd param: - : default value for the param
|
||||
parse_cnf()
|
||||
{
|
||||
local group=$1
|
||||
local var=$2
|
||||
local reval=""
|
||||
|
||||
# print the default settings for given group using my_print_default.
|
||||
# normalize the variable names specified in cnf file (user can use _ or - for example log-bin or log_bin)
|
||||
# then grep for needed variable
|
||||
# finally get the variable value (if variables has been specified multiple time use the last value only)
|
||||
|
||||
# look in group+suffix
|
||||
if [[ -n $WSREP_SST_OPT_CONF_SUFFIX ]]; then
|
||||
reval=$($MY_PRINT_DEFAULTS -c $WSREP_SST_OPT_CONF "${group}${WSREP_SST_OPT_CONF_SUFFIX}" | awk -F= '{if ($1 ~ /_/) { gsub(/_/,"-",$1); print $1"="$2 } else { print $0 }}' | grep -- "--$var=" | cut -d= -f2- | tail -1)
|
||||
fi
|
||||
|
||||
# look in group
|
||||
if [[ -z $reval ]]; then
|
||||
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- | tail -1)
|
||||
fi
|
||||
|
||||
# use default if we haven't found a value
|
||||
if [[ -z $reval ]]; then
|
||||
[[ -n $3 ]] && reval=$3
|
||||
fi
|
||||
echo $reval
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue