Sergei Golubchik
57e0da50bb
Merge branch '10.2' into 10.3
2018-09-28 16:37:06 +02:00
Sergei Golubchik
5ae8fce50b
Merge branch '10.1' into 10.2
2018-09-24 11:46:08 +02:00
Oleksandr Byelkin
28f08d3753
Merge branch '10.1' into 10.2
2018-09-14 08:47:22 +02:00
Daniel Black
b96d36344e
MDEV-17173: correct parsing of 12.13.14.15:4444/xtrabackup_sst leaving LSN/SST_VER blank
...
Correcting commit e78e308e81
2018-09-13 10:00:51 +10:00
Marko Mäkelä
2f4c391958
Merge 10.2 into 10.3
2018-09-06 22:35:45 +03:00
Jan Lindström
653038ccad
Merge pull request #855 from tempesta-tech/sysprg/10.1-MDEV-10756
...
MDEV-10756: wsrep_sst_xtrabackup-v2 does not support innodb_data_home_dir
2018-09-06 14:10:29 +03:00
Jan Lindström
b44b9f71bd
MDEV-15436: If log_bin and log_bin_index is different SST with rsync fails.
...
Problem was that in SST log_bin_index name and directory was not
handled and passed to rsync SST script.
wsrep_sst_common.sh
Read binlog index dirname and filename if --binlog-index
parameter is provided. Read binlog filenames from that file
from donor and write transfered binlog filenames to that
file in joiner.
mysqld.cc, mysqld.h
Moved opt_binlog_index_name from static to global and added
it to extern.
wsrep_sst.cc
generate_binlog_index_opt_val
New function to generate binlog index name if opt_binlog_index_name is
given on configuration.
sst_prepare_other
Add binlog index configuration to SST command.
wsrep_sst.h
Add new SST parameter --binlog-index
Add test case.
2018-09-05 10:34:36 +03:00
Marko Mäkelä
206528f722
Merge 10.1 into 10.2
2018-08-31 15:10:02 +03:00
Jan Lindström
104089e182
MDEV-15512 - Fix sh parse error when [sst] config value has spaces.
...
Merged https://github.com/MariaDB/server/pull/617 authored by
Colin Mollenhour.
2018-08-29 19:30:03 +03:00
Julius Goryavsky
c11fb374b5
MDEV-10756: wsrep_sst_xtrabackup-v2 does not support innodb_data_home_dir
...
Current versions of xtrabackup-v2 and mariabackup support the option
--innodb-data-home-dir, but this parameter is not passed to them from
the SST script, since the SST script does not receive this information
from mysqld. The transfer of this information to the SST is already
fixed by the MDEV-10754 patch, but we need to process it in the SST
script. Also, we should take into account that on the joiner side
the corresponding information is not read yet from the configuration
file (at the mysqld side) during the start of SST, so the script must
itself read it.
https://jira.mariadb.org/browse/MDEV-10756
2018-08-27 16:24:29 +02:00
Julius Goryavsky
7e8ed15b95
Fixes after review and correction of the problems caused by the fact that during the SST innodb plugin is not yet initialized, as well as problems with running tests from the root user (not directly related to the MDEV-10754).
2018-08-09 02:24:12 +00:00
Sergei Golubchik
36e59752e7
Merge branch '10.2' into 10.3
2018-06-30 16:39:20 +02:00
Sergei Golubchik
b942aa34c1
Merge branch '10.1' into 10.2
2018-06-21 23:47:39 +02:00
Sergei Golubchik
c22ab56f0d
fix galera sst tests
...
note that ${A#foo} is $A if there's no prefix foo. That's why
galera nodes tried to connect to 127.0.0.1:127.0.0.1 if there was
no port in the address
Followup for 2b35db5ac4
2018-06-14 18:06:52 +02:00
Vicențiu Ciorbaru
6e55236c0a
Merge branch '10.0-galera' into 10.1
2018-06-12 19:39:37 +03:00
Daniel Black
82f26dafcb
MDEV-13968: wsrep_log_error not defined until later in wsrep_sst_common
...
Fix for 990c4318a7
2018-05-14 10:36:55 +03:00
Sergei Golubchik
fe3c4a4182
MDEV-13968 sst fails with "WSREP_SST_OPT_PORT: readonly variable"
...
followup for 990c4318a7
2018-05-14 10:36:55 +03:00
Sergei Golubchik
e6b31df6df
MDEV-13968 sst fails with "WSREP_SST_OPT_PORT: readonly variable"
2018-05-14 10:36:55 +03:00
Daniel Black
24ab82e675
MDEV-15541: wsrep_sst_common - WSREP_SST_OPT_PORT set twice (--address and --port)
2018-05-14 10:36:55 +03:00
Daniel Black
2b35db5ac4
MDEV-15496: wsrep_sst_common - parse IPv6 correct
...
Fix to e78e308e81b4fbb4183b
2018-05-14 10:36:55 +03:00
Sergei Golubchik
d3681c18f9
followup for 89b0d5cb6e, backport 8c422bf48d
2018-03-23 17:40:09 +01:00
Sergei Golubchik
89b0d5cb6e
MDEV-13968 sst fails with "WSREP_SST_OPT_PORT: readonly variable"
...
Backport from 10.2: 4c2c057d40f7090df712
2018-03-23 00:55:19 +01:00
Jan Lindström
85ddd9e8ce
Revert pull request #640 from grooverdan/10.3-MDEV-8743-wsrep_sst_common-close-fds
2018-03-17 12:56:23 +02:00
Daniel Black
04ed70fa55
MDEV-8743: wsrep_sst_common close FDs > 2
...
To prevent accidential overwriting of files due to mysqld file
descriptors being open we ensure where that only FDs 1, 2 and 3
are available to SST scripts. Assumed is mysqld has thse still
mapped to stdin (unused), stdout and stderr.
2018-03-08 18:55:01 +11:00
Marko Mäkelä
b006d2ead4
Merge bb-10.2-ext into 10.3
2018-02-15 10:22:03 +02:00
Sergei Golubchik
355ee6877b
MDEV-13946 Server RPMs have dependency on "which"
...
cleanup. use "command -v" instead of "which"
simplify some checks.
2018-02-12 12:46:34 +01:00
Alexander Barkov
3cad31f2a7
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
2018-02-08 19:06:25 +04:00
Sergei Golubchik
b4fbb4183b
remove bash-ish from SST scripts
...
replace with awk (yuck!), avoiding gensub (which wasn't recognized)
2018-02-06 14:52:01 +01:00
Sergei Golubchik
4771ae4b22
Merge branch 'github/10.1' into 10.2
2018-02-06 14:50:50 +01:00
Sergei Golubchik
c383418cbf
Merge branch 'github/10.0-galera' into 10.1
2018-02-03 08:09:06 +01:00
Daniel Black
51ea696c8e
wsrep_sst_common: keep WSREP_SST_OPT_HOST_UNESCAPED for IPv4
...
change wsrep_sst_mysqldump.sh to use WSREP_SST_OPT_HOST_UNESCAPED
directly.
2018-01-14 23:31:14 +11:00
Daniel Black
e78e308e81
wsrep_sst_common: parse --address and split WSREP_SST_OPT_PATH
...
Use the string functionality of sh to split the address:
IPv6 test:
. scripts/wsrep_sst_common.sh --address [ipv6]:port/module/lsn_version/sst_ver/some_future_option1/some_future_option2
$ set | grep WSREP_SST
WSREP_SST_OPT_ADDR='[ipv6]:port/module/lsn_version/sst_ver/some_future_option1/some_future_option2'
WSREP_SST_OPT_AUTH=
WSREP_SST_OPT_BINLOG=
WSREP_SST_OPT_BYPASS=0
WSREP_SST_OPT_CONF=' '
WSREP_SST_OPT_DATA=
WSREP_SST_OPT_DEFAULT=
WSREP_SST_OPT_EXTRA_DEFAULT=
WSREP_SST_OPT_HOST='[ipv6]'
WSREP_SST_OPT_HOST_UNESCAPED=ipv6
WSREP_SST_OPT_LSN=lsn_version
WSREP_SST_OPT_MODULE=module
WSREP_SST_OPT_PATH=module/lsn_version/sst_ver/some_future_option1/some_future_option2
WSREP_SST_OPT_PORT=port
WSREP_SST_OPT_PSWD=
WSREP_SST_OPT_SST_VER=sst_ver
WSREP_SST_OPT_SUFFIX_DEFAULT=
WSREP_SST_OPT_USER=
IPv4 test:
. scripts/wsrep_sst_common.sh --address ipv4:port/module/lsn_version/sst_ver/some_future_option1/some_future_option2
$ set | grep WSREP_SST
WSREP_SST_OPT_ADDR=ipv4:port/module/lsn_version/sst_ver/some_future_option1/some_future_option2
WSREP_SST_OPT_AUTH=
WSREP_SST_OPT_BINLOG=
WSREP_SST_OPT_BYPASS=0
WSREP_SST_OPT_CONF=' '
WSREP_SST_OPT_DATA=
WSREP_SST_OPT_DEFAULT=
WSREP_SST_OPT_EXTRA_DEFAULT=
WSREP_SST_OPT_HOST=ipv4
WSREP_SST_OPT_LSN=lsn_version
WSREP_SST_OPT_MODULE=module
WSREP_SST_OPT_PATH=module/lsn_version/sst_ver/some_future_option1/some_future_option2
WSREP_SST_OPT_PORT=port
WSREP_SST_OPT_PSWD=
WSREP_SST_OPT_SST_VER=sst_ver
WSREP_SST_OPT_SUFFIX_DEFAULT=
WSREP_SST_OPT_USER=
2018-01-14 23:31:13 +11:00
Daniel Black
95e5fe6732
wsrep_sst_common: parse_cnf - use awk rather than grep/cut/tail excessiveness
...
Test cases:
f($var) = awk -v var="${var}" \
'BEGIN { OFS=FS="="}
{ gsub(/_/,"-",$1); if ( $1=="--"var ) lastval=substr($0,length($1)+2) }
END { print lastval }'
Missing input is blank:
$ echo '--var_aa=something' | f(var-b-not-ther)
(blank as expected)
All RHS of = is unmunged:
$ echo '--var_aa=password==_-$' | f(var-aa)
password==_-$
Mixed - and _ in var name:
$ echo '--var_aa-bb_cc=1' | f(var-aa-bb-cc)
1
No value returns blank line:
$ echo '--var_aa-bb_cc' | f(var-aa-bb-cc)
(blank line as expected)
Multiples return the last:
$ echo -e "--bb=cc\n--bb=dd" | f(bb)
dd
2018-01-14 23:31:01 +11:00
Sergei Golubchik
943c62a5d4
Backport 4bb49d84a9, correct handling on defaults[-extra]-file is SST scripts
...
(from 10.1 to 10.0-galera)
This conflicted signficantly with 7d550c76be4bb49d84a9daniel@linux.vnet.ibm.com >
2018-01-14 22:48:02 +11:00
Martynas Bendorius
1c2f59f7fb
MDEV-13969 sst mysqldump and xtrabackup-v2 handle WSREP_SST_OPT_CONF incorrectly
...
wrep_sst_common: Setting "-c ''" for my_print_defaults just takes no values from config at all. $MY_PRINT_DEFAULTS is already set at the top of the script to have --defaults-file and --defaults-extra-file. If WSREP_SST_OPT_CONF if set to "--defaults-file=/etc/my.cnf --defaults-extra-file=/etc/my.extra.cnf", then "my_print_defaults -c "" --defaults-file=/etc/my.cnf" succeeds, but if WSREP_SST_OPT_CONF is empty - no default values are taken at all.
wsrep_sst_xtrabackup-v2: innobackupex does not support --defaults-extra-file, so ${WSREP_SST_OPT_CONF} cannot be used as an argument, it has been changed to ${WSREP_SST_OPT_DEFAULT}. Removed --defaults-file= from INNOMOVE line, because WSREP_SST_OPT_CONF already includes it (INNOBACKUP was fine, INNOMOVE - not).
2017-12-18 16:41:40 +01:00
Alexander Barkov
5b697c5a23
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
2017-11-29 12:06:48 +04:00
Sergei Golubchik
8c422bf48d
MDEV-14256 MariaDB 10.2.10 can't SST with xtrabackup-v2
...
another followup for 4c2c057d40
2017-11-21 20:03:57 +01:00
Sergei Golubchik
7f1900705b
Merge branch '10.1' into 10.2
2017-11-21 19:47:46 +01:00
Sergei Golubchik
2a4e4335c4
Merge branch 'github/10.0-galera' into 10.1
2017-11-10 01:38:03 +01:00
Alexander Barkov
003cb2f424
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
2017-10-30 16:42:46 +04:00
Sergei Golubchik
f7090df712
MDEV-13968 sst fails with "WSREP_SST_OPT_PORT: readonly variable"
...
followup for 4c2c057d40
2017-10-25 01:03:19 +02:00
Sergei Golubchik
4c2c057d40
MDEV-13968 sst fails with "WSREP_SST_OPT_PORT: readonly variable"
2017-10-18 22:15:26 +02:00
Marko Mäkelä
1641879387
Merge 10.2 into bb-10.2-ext
2017-10-03 17:02:18 +03:00
Vincent Milum Jr
98e09ee4b6
MDEV-13909 Fix wsrep_sst_rsync fails on debian
...
Fix for the following error messages during SST:
/usr/local/mysql/bin/wsrep_sst_rsync: 258: /usr/local/mysql/bin/wsrep_sst_rsync: [[: not found
/usr/local/mysql/bin/wsrep_sst_rsync: 263: /usr/local/mysql/bin/wsrep_sst_rsync: [[: not found
/usr/local/mysql/bin/wsrep_sst_rsync: 268: /usr/local/mysql/bin/wsrep_sst_rsync: [[: not found
2017-10-02 13:21:00 -07:00
Martynas Bendorius
36ef89c999
wrep_sst_common: Setting "-c ''" for my_print_defaults just takes no values from config at all. $MY_PRINT_DEFAULTS is already set at the top of the script to have --defaults-file and --defaults-extra-file. If WSREP_SST_OPT_CONF if set to "--defaults-file=/etc/my.cnf --defaults-extra-file=/etc/my.extra.cnf", then "my_print_defaults -c "" --defaults-file=/etc/my.cnf" succeeds, but if WSREP_SST_OPT_CONF is empty - no default values are taken at all.
...
wsrep_sst_xtrabackup-v2: innobackupex does not support --defaults-extra-file, so ${WSREP_SST_OPT_CONF} cannot be used as an argument, it has been changed to ${WSREP_SST_OPT_DEFAULT}. Removed --defaults-file= from INNOMOVE line, because WSREP_SST_OPT_CONF already includes it (INNOBACKUP was fine, INNOMOVE - not).
2017-10-01 15:50:25 +02:00
Marko Mäkelä
6749d39a95
Merge 10.2 into bb-10.2-ext
2017-09-01 08:47:55 +03:00
Marko Mäkelä
a36c369bda
Merge 10.1 into 10.2
...
For running the Galera tests, the variable my_disable_leak_check
was set to true in order to avoid assertions due to memory leaks
at shutdown.
Some adjustments due to MDEV-13625 (merge InnoDB tests from MySQL 5.6)
were performed. The most notable behaviour changes from 10.0 and 10.1
are the following:
* innodb.innodb-table-online: adjustments for the DROP COLUMN
behaviour change (MDEV-11114, MDEV-13613)
* innodb.innodb-index-online-fk: the removal of a (1,NULL) record
from the result; originally removed in MySQL 5.7 in the
Oracle Bug #16244691 fix
377774689b#77497 fix was not merged from 5.6 to 5.7.10)
* innodb.innodb-alter-autoinc: MariaDB 10.2 behaves like MySQL 5.6/5.7,
while MariaDB 10.0 and 10.1 assign different values when
auto_increment_increment or auto_increment_offset are used.
Also MySQL 5.6/5.7 exhibit different behaviour between
LGORITHM=INPLACE and ALGORITHM=COPY, so something needs to be tested
and fixed in both MariaDB 10.0 and 10.2.
* innodb.innodb-wl5980-alter: disabled because it would trigger an
InnoDB assertion failure (MDEV-13668 may need additional effort in 10.2)
2017-08-31 09:30:40 +03:00
Jan Lindström
c23efc7d50
Merge remote-tracking branch 'origin/10.0-galera' into 10.1
2017-08-21 13:35:00 +03:00
Alexey Yurchenko
83664e21e4
MW-366 Improved support for IPv6 networks - made mysqld and SST scripts to recognize []-escaped IPv6 addresses - pulled in latest Percona and MariaDB updates to SST scripts - instruct netcat and socat in wsrep_sst_xtrabackup-v2 to listen on IPv6 socket via sockopt parameter in the [sst] section of my.cnf
...
In summary, wsrep_node_address and wsrep_sst_receive_address can now
be set to IPv6 addresses escaped by []. Rsync SST works out ouf the
box thanks to rsync daemon listening on both IPv4 and IPv6 sockets by
default. For xtrabackup SST onver IPv6 one needs to set sockopt in
the [sst] section of joiner's configuration file to ",pf=ip6" if
using socat as a streamer or to "-6" if using netcat.
2017-08-11 15:00:18 +03:00
Alexander Barkov
9bc3225642
Merge tag 'mariadb-10.2.6' into bb-10.2-ext
2017-05-26 19:32:28 +04:00
