[Commits] cdb2dc82c18: Merge remote-tracking branch 'origin/10.1' into 10.2

10 Mar 2019

revision-id: cdb2dc82c181c8257016de1cba9c5563bc32986f (mariadb-10.2.22-47-gcdb2dc82c18)
parent(s): ab7e2b048d7d0835ae7473873169b7606114348e b31d025c97cf49ea9d0da26e5948f693e8af60dc
author: Jan Lindström
committer: Jan Lindström
timestamp: 2019-03-10 11:09:45 +0200
message:

Merge remote-tracking branch 'origin/10.1' into 10.2


 mysql-test/suite/galera/disabled.def               |  3 +
 .../suite/galera/r/galera_kill_nochanges.result    |  2 +
 .../suite/galera/r/galera_kill_smallchanges.result |  2 +
 mysql-test/suite/galera/r/galera_many_rows.result  | 28 ++++----
 .../suite/galera/r/galera_var_dirty_reads.result   |  2 -
 .../galera/t/galera_autoinc_sst_mariabackup.test   | 10 +--
 .../suite/galera/t/galera_kill_nochanges.test      |  9 ++-
 .../suite/galera/t/galera_kill_smallchanges.test   |  9 ++-
 mysql-test/suite/galera/t/galera_many_rows.cnf     |  5 ++
 mysql-test/suite/galera/t/galera_many_rows.test    | 19 ++++--
 .../suite/galera/t/galera_var_dirty_reads.test     |  5 --
 .../r/galera_ipv6_mariabackup_section.result       | 23 +++++++
 .../r/galera_ipv6_rsync_section.result             | 17 +++++
 .../t/galera_ipv6_mariabackup_section.cnf          | 39 +++++++++++
 .../t/galera_ipv6_mariabackup_section.opt          |  1 +
 .../t/galera_ipv6_mariabackup_section.test         | 69 +++++++++++++++++++
 .../galera_3nodes/t/galera_ipv6_rsync_section.cnf  | 31 +++++++++
 .../galera_3nodes/t/galera_ipv6_rsync_section.opt  |  1 +
 .../galera_3nodes/t/galera_ipv6_rsync_section.test | 32 +++++++++
 scripts/wsrep_sst_common.sh                        |  2 -
 scripts/wsrep_sst_mariabackup.sh                   | 77 +++++++++++++---------
 scripts/wsrep_sst_rsync.sh                         |  5 +-
 scripts/wsrep_sst_xtrabackup-v2.sh                 |  3 -
 23 files changed, 316 insertions(+), 78 deletions(-)

diff --cc mysql-test/suite/galera/disabled.def
index 4a6e6919511,baa5afd95a6..f11cd61b6c4

--- a/mysql-test/suite/galera/disabled.def
+++ b/mysql-test/suite/galera/disabled.def
@@@ -11,9 -11,6 +11,10 @@@
  ##############################################################################
  
  GAL-419 : MDEV-13549 Galera test failures
++MW-286 : MDEV-18874 Galera test MW-286 causes Mutex = TTASEventMutex<GenericPolicy>]: Assertion `!is_owned()' failed. assertion
 +MW-328A : MDEV-17847 Galera test failure on MW-328[A|B|C]
 +MW-328B : MDEV-17847 Galera test failure on MW-328[A|B|C]
 +MW-328C : MDEV-17847 Galera test failure on MW-328[A|B|C]
  MW-329 : wsrep_local_replays not stable
  MW-336 : MDEV-13549 Timeout in wait_condition.inc for PROCESSLIST
  MW-416 : MDEV-13549 Galera test failures
@@@ -26,19 -22,28 +27,21 @@@ galera_as_slave_replication_bundle : MD
  galera_binlog_rows_query_log_events: MariaDB does not support binlog_rows_query_log_events
  galera_binlog_stmt_autoinc : MDEV-13549 auto_increment mismatch
  galera_flush :  MariaDB does not have global.thread_statistics
++galera_gcache_recover_manytrx : MDEV-18834 Galera test failure on galera_gcache_recover_manytrx
  galera_gcs_fc_limit : MDEV-17061 Timeout in wait_condition.inc for PROCESSLIST
++galera_ist_mariabackup : MDEV-18829 Galera test galera_ist_mariabackup leaves port open causing following SST tests to fail
 +galera_ist_progress: MDEV-15236 galera_ist_progress fails when trying to read transfer status
 +galera_kill_applier : race condition at the start of the test
 +galera_kill_ddl : MDEV-17108 Test failure on galera.galera_kill_ddl
  galera_migrate : MariaDB does not support START SLAVE USER
 -galera_pc_ignore_sb : MDEV-17357 Test failure on galera.galera_pc_ignore_sb
 +galera_pc_ignore_sb : MDEV-15811/MDEV-17357 Test failure
  galera_ssl_upgrade : MDEV-13549 Galera test failures
 -MW-329 : wsrep_local_replays not stable
 -MW-416 : MDEV-13549 Galera test failures
 -MW-44 : MDEV-15809 Test failure on galera.MW-44
 -galera_pc_ignore_sb : MDEV-15811 Test failure on galera_pc_ignore_sb
 -galera_kill_applier : race condition at the start of the test
 -galera_ist_progress: MDEV-15236 galera_ist_progress fails when trying to read transfer status
 -pxc-421: Lock timeout exceeded
  galera_sst_mysqldump_with_key : MDEV-16890 Galera test failure
 +galera_sst_xtrabackup-v2 : MDEV-17848 Galera test failure
 +galera_sst_xtrabackup-v2_data_dir : MDEV-17848 Galera test failure
 +galera_var_node_address : MDEV-17151 Galera test failure
  galera_var_notify_cmd : MDEV-13549 Galera test failures
 -galera_kill_ddl : MDEV-17108 Test failure on galera.galera_kill_ddl
 -galera_var_node_address : MDEV-17151 Galera test failure on galera.galera_var_node_address
 -galera_as_slave_replication_bundle : MDEV-15785 Test case galera_as_slave_replication_bundle caused debug assertion
  galera_wan : MDEV-17259: Test failure on galera.galera_wan
  partition : MDEV-13549 regularly showing auto_increment mismatch
 -galera_pc_ignore_sb : MDEV-17357 Test failure on galera.galera_pc_ignore_sb
 -MW-328A : MDEV-17847 Galera test failure on MW-328[A|B|C]
 -MW-328B : MDEV-17847 Galera test failure on MW-328[A|B|C]
 -MW-328C : MDEV-17847 Galera test failure on MW-328[A|B|C]
 +pxc-421: Lock timeout exceeded
  query_cache : MDEV-18137: Galera test failure on query_cache
 -galera_ist_mariabackup : MDEV-18829 Galera test galera_ist_mariabackup leaves port open causing following SST tests to fail
 -galera.galera_gcache_recover_manytrx : MDEV-18834 Galera test failure on galera_gcache_recover_manytrx
diff --cc mysql-test/suite/galera/r/galera_kill_nochanges.result
index 56caf1bd9ea,cdcebdb4eee..3ccf73f0d46
--- a/mysql-test/suite/galera/r/galera_kill_nochanges.result
+++ b/mysql-test/suite/galera/r/galera_kill_nochanges.result
@@@ -1,13 -1,8 +1,15 @@@
 +connection node_1;
++connection node_2;
++connection node_1;
  CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB;
  INSERT INTO t1 VALUES (1);
 +connection node_2;
  Killing server ...
 +connection node_1;
  SET SESSION wsrep_sync_wait = 0;
  SET SESSION wsrep_sync_wait = DEFAULT;
 +connection node_2;
 +connection node_2a;
  SELECT COUNT(*) = 1 FROM t1;
  COUNT(*) = 1
  1
diff --cc mysql-test/suite/galera/r/galera_kill_smallchanges.result
index 2ee291004b0,863b49dd51b..07d1d12ef9e
--- a/mysql-test/suite/galera/r/galera_kill_smallchanges.result
+++ b/mysql-test/suite/galera/r/galera_kill_smallchanges.result
@@@ -1,13 -1,8 +1,15 @@@
++connection node_1;
++connection node_2;
  call mtr.add_suppression("WSREP: Last Applied Action message in non-primary configuration from member .*");
 +connection node_1;
  SET GLOBAL wsrep_provider_options = 'pc.ignore_sb=true';
  CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB;
 +connection node_2;
  Killing server ...
 +connection node_1;
  INSERT INTO t1 VALUES (1);
 +connection node_2;
 +connection node_2a;
  SELECT COUNT(*) = 1 FROM t1;
  COUNT(*) = 1
  1
diff --cc mysql-test/suite/galera/r/galera_many_rows.result
index b06925fea60,6f441d9b401..d6669fe6bdf
--- a/mysql-test/suite/galera/r/galera_many_rows.result
+++ b/mysql-test/suite/galera/r/galera_many_rows.result
@@@ -1,7 -1,6 +1,9 @@@
 +connection node_1;
++connection node_2;
++connection node_1;
  SET SESSION innodb_lock_wait_timeout=600;
  SET SESSION lock_wait_timeout=600;
- CREATE TABLE ten (f1 INTEGER);
+ CREATE TABLE ten (f1 INTEGER) engine=InnoDB;
  INSERT INTO ten VALUES (1),(2),(3),(4),(5),(6),(7),(8),(9),(10);
  CREATE TABLE t1 (f1 INTEGER AUTO_INCREMENT PRIMARY KEY, f2 INTEGER) Engine=InnoDB;
  INSERT INTO t1 (f2) SELECT a1.f1 FROM ten AS a1, ten AS a2, ten AS a3, ten AS a4, ten AS a5;
@@@ -9,32 -7,26 +11,32 @@@ connection node_2
  SET SESSION wsrep_sync_wait = 0;
  SET SESSION wsrep_sync_wait = 15;
  SET GLOBAL wsrep_provider_options = 'repl.causal_read_timeout=PT1H';
- SELECT COUNT(*) = 100000 FROM t1;
- COUNT(*) = 100000
- 1
+ SELECT COUNT(*) FROM t1;
+ COUNT(*)
+ 100000
  INSERT INTO t1 (f2) SELECT a1.f1 FROM ten AS a1, ten AS a2, ten AS a3, ten AS a4, ten AS a5;
 +connection node_1;
- SELECT COUNT(*) = 200000 FROM t1;
- COUNT(*) = 200000
- 1
+ SELECT COUNT(*) FROM t1;
+ COUNT(*)
+ 200000
  UPDATE t1 SET f2 = 1;
 +connection node_2;
- SELECT COUNT(*) = 200000 FROM t1 WHERE f2 = 1;
- COUNT(*) = 200000
- 1
+ SELECT COUNT(*) FROM t1 WHERE f2 = 1;
+ COUNT(*)
+ 200000
 +connection node_1;
  START TRANSACTION;
- SELECT COUNT(*) = 200000 FROM t1;
- COUNT(*) = 200000
- 1
+ SELECT COUNT(*) FROM t1;
+ COUNT(*)
+ 200000
  UPDATE t1 SET f2 = 3;
 +connection node_2;
  START TRANSACTION;
  UPDATE t1 SET f2 = 4;
 +connection node_1;
  COMMIT;
 +connection node_2;
  COMMIT;
 -ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
 +ERROR 40001: Deadlock: wsrep aborted transaction
  DROP TABLE t1;
  DROP TABLE ten;
diff --cc mysql-test/suite/galera/r/galera_var_dirty_reads.result
index 049aa5be3cc,5a108ddfcaa..020efb7b8f1
--- a/mysql-test/suite/galera/r/galera_var_dirty_reads.result
+++ b/mysql-test/suite/galera/r/galera_var_dirty_reads.result
@@@ -1,8 -1,3 +1,6 @@@
 +connection node_1;
 +connection node_2;
- connection node_1;
- connection node_2;
 +connection node_2;
  CREATE TABLE t1(i INT) ENGINE=INNODB;
  INSERT INTO t1 VALUES(1);
  SELECT * FROM t1;
diff --cc mysql-test/suite/galera/t/galera_kill_smallchanges.test
index 148c3dbc132,148c3dbc132..07c9dd52b3e
--- a/mysql-test/suite/galera/t/galera_kill_smallchanges.test
+++ b/mysql-test/suite/galera/t/galera_kill_smallchanges.test
@@@ -3,7 -3,7 +3,11 @@@
  #
  
  --source include/galera_cluster.inc
----source include/have_innodb.inc
++
++# Save original auto_increment_offset values.
++--let $node_1=node_1
++--let $node_2=node_2
++--source include/auto_increment_offset_save.inc
  
  call mtr.add_suppression("WSREP: Last Applied Action message in non-primary configuration from member .*");
  
@@@ -38,4 -38,4 +42,7 @@@ SELECT VARIABLE_VALUE = 2 FROM INFORMAT
  --eval SET GLOBAL wsrep_provider_options = '$wsrep_provider_options_orig';
  --enable_query_log
  
++--let $node_2=node_2a
++--source include/auto_increment_offset_restore.inc
++
  DROP TABLE t1;
diff --cc mysql-test/suite/galera_3nodes/r/galera_ipv6_mariabackup_section.result
index 00000000000,53e35939a79..5a844537327
mode 000000,100644..100644
--- a/mysql-test/suite/galera_3nodes/r/galera_ipv6_mariabackup_section.result
+++ b/mysql-test/suite/galera_3nodes/r/galera_ipv6_mariabackup_section.result
@@@ -1,0 -1,18 +1,23 @@@
+ SELECT VARIABLE_VALUE LIKE '%[::1]%' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_incoming_addresses';
+ VARIABLE_VALUE LIKE '%[::1]%'
+ 1
+ SELECT VARIABLE_VALUE = 3 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
+ VARIABLE_VALUE = 3
+ 1
++connection node_2;
+ SET GLOBAL wsrep_provider_options='gmcast.isolate=1';
++connection node_1;
+ CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB;
+ INSERT INTO t1 VALUES (1);
++connection node_2;
+ SET GLOBAL wsrep_provider_options='gmcast.isolate=0';
+ SELECT COUNT(*) = 1 FROM t1;
+ COUNT(*) = 1
+ 1
+ DROP TABLE t1;
++connection node_1;
+ include/assert_grep.inc [Streaming the backup to joiner at \[::1\]]
+ include/assert_grep.inc [async IST sender starting to serve tcp://\[::1\]:]
++connection node_2;
+ include/assert_grep.inc [IST receiver addr using tcp://\[::1\]]
+ include/assert_grep.inc [Prepared IST receiver, listening at: tcp://\[::1\]]
diff --cc mysql-test/suite/galera_3nodes/r/galera_ipv6_rsync_section.result
index 00000000000,a2bf5f4d98c..bcf74142144
mode 000000,100644..100644
--- a/mysql-test/suite/galera_3nodes/r/galera_ipv6_rsync_section.result
+++ b/mysql-test/suite/galera_3nodes/r/galera_ipv6_rsync_section.result
@@@ -1,0 -1,14 +1,17 @@@
+ SELECT VARIABLE_VALUE LIKE '%[::1]%' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_incoming_addresses';
+ VARIABLE_VALUE LIKE '%[::1]%'
+ 1
+ SELECT VARIABLE_VALUE = 3 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
+ VARIABLE_VALUE = 3
+ 1
++connection node_2;
+ SET GLOBAL wsrep_provider_options='gmcast.isolate=1';
++connection node_1;
+ CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB;
+ INSERT INTO t1 VALUES (1);
++connection node_2;
+ SET GLOBAL wsrep_provider_options='gmcast.isolate=0';
+ SELECT COUNT(*) = 1 FROM t1;
+ COUNT(*) = 1
+ 1
+ DROP TABLE t1;
diff --cc scripts/wsrep_sst_mariabackup.sh
index 039a350b18a,e8344bbaf8d..a763dadc2d8
--- a/scripts/wsrep_sst_mariabackup.sh
+++ b/scripts/wsrep_sst_mariabackup.sh
@@@ -554,10 -549,10 +549,10 @@@ wait_for_listen(
      do
  	if [ "$OS" = "FreeBSD" ];then
              sockstat -46lp $PORT | grep -qE "^[^ ]* *(socat|nc) *[^ ]* *[^ ]* *[^ ]* *[^ ]*:$PORT" && break
 -	else
 +        else
-             ss -p state listening "( sport = :$PORT )" | grep -qE 'socat|nc' && break
+ 	    ss -p state listening "( sport = :$PORT )" | grep -qE 'socat|nc' && break
 -	fi
 +        fi
-         sleep 0.2
+ 	sleep 0.2
      done
      echo "ready ${ADDR}/${MODULE}//$sst_ver"
  }

    

jan

tags

participants (1)