Skip to content

Commit 55be043

Browse files
author
Jan Lindström
authored
Merge pull request #1120 from tempesta-tech/sysprg/MDEV-17835v2
MDEV-17835: Remove wsrep-sst-method=xtrabackup
2 parents d4144c8 + 0e89e90 commit 55be043

38 files changed

+216
-127
lines changed

‎debian/mariadb-server-10.3.install

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,7 @@ usr/share/man/man1/resolveip.1
8888
usr/share/man/man1/wsrep_sst_common.1
8989
usr/share/man/man1/wsrep_sst_mysqldump.1
9090
usr/share/man/man1/wsrep_sst_rsync.1
91-
usr/share/man/man1/wsrep_sst_xtrabackup-v2.1
92-
usr/share/man/man1/wsrep_sst_xtrabackup.1
91+
usr/share/man/man1/wsrep_sst_mariabackup.1
9392
usr/share/mysql/errmsg-utf8.txt
9493
usr/share/mysql/fill_help_tables.sql
9594
usr/share/mysql/maria_add_gis_sp_bootstrap.sql

‎man/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ SET(MAN1_SERVER innochecksum.1 my_print_defaults.1 myisam_ftdump.1 myisamchk.1
2525
resolveip.1 mariadb-service-convert.1
2626
mysqld_safe_helper.1 tokuftdump.1 wsrep_sst_common.1
2727
wsrep_sst_mysqldump.1 wsrep_sst_rsync.1
28-
wsrep_sst_xtrabackup-v2.1 wsrep_sst_xtrabackup.1
2928
galera_recovery.1 galera_new_cluster.1 tokuft_logprint.1
3029
mysql_ldb.1
3130
wsrep_sst_mariabackup.1 mbstream.1 mariabackup.1

‎man/wsrep_sst_xtrabackup-v2.1

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎man/wsrep_sst_xtrabackup.1

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎mysql-test/suite/galera/disabled.def

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ galera_kill_applier : race condition at the start of the test
3131
galera_ist_progress: MDEV-15236 galera_ist_progress fails when trying to read transfer status
3232
pxc-421: Lock timeout exceeded
3333
galera_sst_mysqldump_with_key : MDEV-16890 Galera test failure
34-
galera_sst_xtrabackup-v2-options : Failed to read uuid:seqno and wsrep_gtid_domain_id from joiner script
3534
galera_gcs_fc_limit : Timeouts
3635
pool_of_threads: WSREP has not yet prepared node for application use
3736
galera_var_innodb_disallow_writes : Timeout

‎mysql-test/suite/galera_3nodes/disabled.def

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
11
galera_slave_options_do :MDEV-8798
22
galera_slave_options_ignore : MDEV-8798
3-
galera_innobackupex_backup : xtrabackup is deprecated
4-
galera_ipv6_xtrabackup-v2 : xtrabackup is deprecated

‎mysql-test/suite/galera_3nodes/galera_2x3nodes.cnf

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ wsrep_node_address=127.0.0.1
2222
#ist_port=@OPT.port
2323
#sst_port=@OPT.port
2424
wsrep-cluster-address='gcomm://'
25-
wsrep_provider_options='base_port=@mysqld.1.#galera_port;evs.suspect_timeout=PT300S;evs.inactive_timeout=PT1000M;evs.install_timeout=PT155S;evs.keepalive_period = PT100S'
25+
wsrep_provider_options='repl.causal_read_timeout=PT90S;base_port=@mysqld.1.#galera_port;evs.suspect_timeout=PT300S;evs.inactive_timeout=PT1000M;evs.install_timeout=PT155S;evs.keepalive_period = PT100S'
2626

2727
wsrep_sst_receive_address=127.0.0.2:@mysqld.1.#sst_port
2828
wsrep_node_incoming_address=127.0.0.1:@mysqld.1.port
@@ -33,7 +33,7 @@ wsrep_sst_receive_address='127.0.0.1:@mysqld.1.#sst_port'
3333
#ist_port=@OPT.port
3434
#sst_port=@OPT.port
3535
wsrep_cluster_address='gcomm://127.0.0.1:@mysqld.1.#galera_port'
36-
wsrep_provider_options='base_port=@mysqld.2.#galera_port;evs.suspect_timeout=PT300S;evs.inactive_timeout=PT1000M;evs.install_timeout=PT155S;evs.keepalive_period = PT100S'
36+
wsrep_provider_options='repl.causal_read_timeout=PT90S;base_port=@mysqld.2.#galera_port;evs.suspect_timeout=PT300S;evs.inactive_timeout=PT1000M;evs.install_timeout=PT155S;evs.keepalive_period = PT100S'
3737

3838
wsrep_sst_receive_address=127.0.0.2:@mysqld.2.#sst_port
3939
wsrep_node_incoming_address=127.0.0.1:@mysqld.2.port
@@ -44,7 +44,7 @@ wsrep_sst_receive_address='127.0.0.1:@mysqld.2.#sst_port'
4444
#ist_port=@OPT.port
4545
#sst_port=@OPT.port
4646
wsrep_cluster_address='gcomm://127.0.0.1:@mysqld.1.#galera_port'
47-
wsrep_provider_options='base_port=@mysqld.3.#galera_port;evs.suspect_timeout=PT300S;evs.inactive_timeout=PT1000M;evs.install_timeout=PT155S;evs.keepalive_period = PT100S'
47+
wsrep_provider_options='repl.causal_read_timeout=PT90S;base_port=@mysqld.3.#galera_port;evs.suspect_timeout=PT300S;evs.inactive_timeout=PT1000M;evs.install_timeout=PT155S;evs.keepalive_period = PT100S'
4848

4949
wsrep_sst_receive_address=127.0.0.2:@mysqld.3.#sst_port
5050
wsrep_node_incoming_address=127.0.0.1:@mysqld.3.port
@@ -58,7 +58,7 @@ wsrep_cluster_name=cluster2
5858
#sst_port=@OPT.port
5959

6060
wsrep-cluster-address='gcomm://'
61-
wsrep_provider_options='base_port=@mysqld.4.#galera_port;evs.suspect_timeout=PT300S;evs.inactive_timeout=PT1000M;evs.install_timeout=PT155S;evs.keepalive_period = PT100S'
61+
wsrep_provider_options='repl.causal_read_timeout=PT90S;base_port=@mysqld.4.#galera_port;evs.suspect_timeout=PT300S;evs.inactive_timeout=PT1000M;evs.install_timeout=PT155S;evs.keepalive_period = PT100S'
6262

6363
wsrep_sst_receive_address=127.0.0.2:@mysqld.4.#sst_port
6464
wsrep_node_incoming_address=127.0.0.1:@mysqld.4.port
@@ -70,7 +70,7 @@ wsrep_cluster_name=cluster2
7070
#ist_port=@OPT.port
7171
#sst_port=@OPT.port
7272
wsrep_cluster_address='gcomm://127.0.0.1:@mysqld.4.#galera_port'
73-
wsrep_provider_options='base_port=@mysqld.5.#galera_port;evs.suspect_timeout=PT300S;evs.inactive_timeout=PT1000M;evs.install_timeout=PT155S;evs.keepalive_period = PT100S'
73+
wsrep_provider_options='repl.causal_read_timeout=PT90S;base_port=@mysqld.5.#galera_port;evs.suspect_timeout=PT300S;evs.inactive_timeout=PT1000M;evs.install_timeout=PT155S;evs.keepalive_period = PT100S'
7474

7575
wsrep_sst_receive_address=127.0.0.2:@mysqld.5.#sst_port
7676
wsrep_node_incoming_address=127.0.0.1:@mysqld.5.port
@@ -82,7 +82,7 @@ wsrep_cluster_name=cluster2
8282
#ist_port=@OPT.port
8383
#sst_port=@OPT.port
8484
wsrep_cluster_address='gcomm://127.0.0.1:@mysqld.4.#galera_port'
85-
wsrep_provider_options='base_port=@mysqld.6.#galera_port;evs.suspect_timeout=PT300S;evs.inactive_timeout=PT1000M;evs.install_timeout=PT155S;evs.keepalive_period = PT100S'
85+
wsrep_provider_options='repl.causal_read_timeout=PT90S;base_port=@mysqld.6.#galera_port;evs.suspect_timeout=PT300S;evs.inactive_timeout=PT1000M;evs.install_timeout=PT155S;evs.keepalive_period = PT100S'
8686

8787
wsrep_sst_receive_address=127.0.0.2:@mysqld.6.#sst_port
8888
wsrep_node_incoming_address=127.0.0.1:@mysqld.6.port

‎mysql-test/suite/galera_3nodes/galera_3nodes.cnf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ wsrep-sync-wait=15
1818
#ist_port=@OPT.port
1919
#sst_port=@OPT.port
2020
wsrep-cluster-address='gcomm://'
21-
wsrep_provider_options='base_port=@mysqld.1.#galera_port;evs.suspect_timeout=PT10S;evs.inactive_timeout=PT30S;evs.install_timeout=PT15S'
21+
wsrep_provider_options='repl.causal_read_timeout=PT90S;base_port=@mysqld.1.#galera_port;evs.suspect_timeout=PT10S;evs.inactive_timeout=PT30S;evs.install_timeout=PT15S'
2222

2323
wsrep_sst_receive_address=127.0.0.2:@mysqld.1.#sst_port
2424
wsrep_node_incoming_address=127.0.0.1:@mysqld.1.port
@@ -29,7 +29,7 @@ wsrep_sst_receive_address='127.0.0.1:@mysqld.1.#sst_port'
2929
#ist_port=@OPT.port
3030
#sst_port=@OPT.port
3131
wsrep_cluster_address='gcomm://127.0.0.1:@mysqld.1.#galera_port'
32-
wsrep_provider_options='base_port=@mysqld.2.#galera_port;evs.suspect_timeout=PT10S;evs.inactive_timeout=PT30S;evs.install_timeout=PT15S'
32+
wsrep_provider_options='repl.causal_read_timeout=PT90S;base_port=@mysqld.2.#galera_port;evs.suspect_timeout=PT10S;evs.inactive_timeout=PT30S;evs.install_timeout=PT15S'
3333

3434
wsrep_sst_receive_address=127.0.0.2:@mysqld.2.#sst_port
3535
wsrep_node_incoming_address=127.0.0.1:@mysqld.2.port
@@ -40,7 +40,7 @@ wsrep_sst_receive_address='127.0.0.1:@mysqld.2.#sst_port'
4040
#ist_port=@OPT.port
4141
#sst_port=@OPT.port
4242
wsrep_cluster_address='gcomm://127.0.0.1:@mysqld.1.#galera_port'
43-
wsrep_provider_options='base_port=@mysqld.3.#galera_port;evs.suspect_timeout=PT10S;evs.inactive_timeout=PT30S;evs.install_timeout=PT15S'
43+
wsrep_provider_options='repl.causal_read_timeout=PT90S;base_port=@mysqld.3.#galera_port;evs.suspect_timeout=PT10S;evs.inactive_timeout=PT30S;evs.install_timeout=PT15S'
4444

4545
wsrep_sst_receive_address=127.0.0.2:@mysqld.3.#sst_port
4646
wsrep_node_incoming_address=127.0.0.1:@mysqld.3.port

‎mysql-test/suite/galera_3nodes/include/have_mariabackup.inc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#
2+
# suite.pm will make sure that all tests including this file
3+
# will be skipped as needed
4+
#

‎mysql-test/suite/galera_3nodes/r/galera_innobackupex_backup.result

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
1+
connection node_1;
2+
connection node_2;
3+
connection node_3;
4+
connection node_1;
15
CREATE TABLE t1 (f1 INTEGER);
26
INSERT INTO t1 VALUES (1),(2),(3),(4),(5),(6),(7),(8),(9),(10);
7+
connection node_2;
38
SELECT COUNT(*) = 10 FROM t1;
49
COUNT(*) = 10
510
1
611
Killing server ...
12+
connection node_1;
713
INSERT INTO t1 VALUES (11),(12),(13),(14),(15),(16),(17),(18),(19),(20);
814
SELECT COUNT(*) = 20 FROM t1;
915
COUNT(*) = 20

0 commit comments

Comments
 (0)