diff options
| author | Julius Goryavsky <julius.goryavsky@mariadb.com> | 2020-01-14 13:57:14 +0100 |
|---|---|---|
| committer | Julius Goryavsky <julius.goryavsky@mariadb.com> | 2020-01-21 10:50:48 +0100 |
| commit | 982294ac1680938ac9223fb64a64e21f0cbc322a (patch) | |
| tree | 3093b17c21a766e1fe2cce45853952df96d63fb6 /scripts | |
| parent | 578b6ba02af4ecd0468e452578cebf3a2a506216 (diff) | |
| download | mariadb-git-982294ac1680938ac9223fb64a64e21f0cbc322a.tar.gz | |
MDEV-17601: MariaDB Galera does not expect 'mbstream' as streamfmt
Setting "streamfmt=mbstream" in the "[sst]" section causes SST to fail
because the format automatically switches to 'tar' by default (insead
of mbstream).
To fix this, we need to add mbstream to the list of valid values for
the format, making it synonymous with xbstream. This must be done both
in the SST script and when parsing the options of the corresponding
utilities.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/wsrep_sst_mariabackup.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/wsrep_sst_mariabackup.sh b/scripts/wsrep_sst_mariabackup.sh index 59d2e12817b..a2d10beee06 100644 --- a/scripts/wsrep_sst_mariabackup.sh +++ b/scripts/wsrep_sst_mariabackup.sh @@ -386,8 +386,8 @@ read_cnf() get_stream() { - if [[ $sfmt == 'xbstream' ]];then - wsrep_log_info "Streaming with xbstream" + if [[ $sfmt == 'mbstream' || $sfmt == 'xbstream' ]];then + wsrep_log_info "Streaming with ${sfmt}" if [[ "$WSREP_SST_OPT_ROLE" == "joiner" ]];then strmcmd="${XBSTREAM_BIN} -x" else |