Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fixes codership/mysql-wsrep#153 use --defaults-extra-file with mysqld…
…ump SST
- Loading branch information
1 parent
5d531f0
commit edd9bd3
Showing
3 changed files
with
150 additions
and
0 deletions.
There are no files selected for viewing
106 changes: 106 additions & 0 deletions
106
mysql-test/suite/galera/r/galera_sst_mysqldump_with_key.result
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,106 @@ | ||
Setting SST method to mysqldump ... | ||
GRANT ALL PRIVILEGES ON *.* TO 'sst' IDENTIFIED BY 'sst'; | ||
SET GLOBAL wsrep_sst_auth = 'sst:sst'; | ||
SET GLOBAL wsrep_sst_method = 'mysqldump'; | ||
CREATE USER sslsst; | ||
GRANT ALL PRIVILEGES ON *.* TO sslsst; | ||
GRANT USAGE ON *.* TO sslsst REQUIRE SSL; | ||
SET GLOBAL wsrep_sst_auth = 'sslsst:'; | ||
Performing State Transfer on a server that has been temporarily disconnected | ||
CREATE TABLE t1 (f1 CHAR(255)) ENGINE=InnoDB; | ||
SET AUTOCOMMIT=OFF; | ||
START TRANSACTION; | ||
INSERT INTO t1 VALUES ('node1_committed_before'); | ||
INSERT INTO t1 VALUES ('node1_committed_before'); | ||
INSERT INTO t1 VALUES ('node1_committed_before'); | ||
INSERT INTO t1 VALUES ('node1_committed_before'); | ||
INSERT INTO t1 VALUES ('node1_committed_before'); | ||
COMMIT; | ||
SET AUTOCOMMIT=OFF; | ||
START TRANSACTION; | ||
INSERT INTO t1 VALUES ('node2_committed_before'); | ||
INSERT INTO t1 VALUES ('node2_committed_before'); | ||
INSERT INTO t1 VALUES ('node2_committed_before'); | ||
INSERT INTO t1 VALUES ('node2_committed_before'); | ||
INSERT INTO t1 VALUES ('node2_committed_before'); | ||
COMMIT; | ||
Unloading wsrep provider ... | ||
SET GLOBAL wsrep_provider = 'none'; | ||
SET AUTOCOMMIT=OFF; | ||
START TRANSACTION; | ||
INSERT INTO t1 VALUES ('node1_committed_during'); | ||
INSERT INTO t1 VALUES ('node1_committed_during'); | ||
INSERT INTO t1 VALUES ('node1_committed_during'); | ||
INSERT INTO t1 VALUES ('node1_committed_during'); | ||
INSERT INTO t1 VALUES ('node1_committed_during'); | ||
COMMIT; | ||
START TRANSACTION; | ||
INSERT INTO t1 VALUES ('node1_to_be_committed_after'); | ||
INSERT INTO t1 VALUES ('node1_to_be_committed_after'); | ||
INSERT INTO t1 VALUES ('node1_to_be_committed_after'); | ||
INSERT INTO t1 VALUES ('node1_to_be_committed_after'); | ||
INSERT INTO t1 VALUES ('node1_to_be_committed_after'); | ||
SET AUTOCOMMIT=OFF; | ||
START TRANSACTION; | ||
INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); | ||
INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); | ||
INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); | ||
INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); | ||
INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); | ||
Loading wsrep provider ... | ||
SET AUTOCOMMIT=OFF; | ||
START TRANSACTION; | ||
INSERT INTO t1 VALUES ('node2_committed_after'); | ||
INSERT INTO t1 VALUES ('node2_committed_after'); | ||
INSERT INTO t1 VALUES ('node2_committed_after'); | ||
INSERT INTO t1 VALUES ('node2_committed_after'); | ||
INSERT INTO t1 VALUES ('node2_committed_after'); | ||
COMMIT; | ||
INSERT INTO t1 VALUES ('node1_to_be_committed_after'); | ||
INSERT INTO t1 VALUES ('node1_to_be_committed_after'); | ||
INSERT INTO t1 VALUES ('node1_to_be_committed_after'); | ||
INSERT INTO t1 VALUES ('node1_to_be_committed_after'); | ||
INSERT INTO t1 VALUES ('node1_to_be_committed_after'); | ||
COMMIT; | ||
SET AUTOCOMMIT=OFF; | ||
START TRANSACTION; | ||
INSERT INTO t1 VALUES ('node1_committed_after'); | ||
INSERT INTO t1 VALUES ('node1_committed_after'); | ||
INSERT INTO t1 VALUES ('node1_committed_after'); | ||
INSERT INTO t1 VALUES ('node1_committed_after'); | ||
INSERT INTO t1 VALUES ('node1_committed_after'); | ||
COMMIT; | ||
INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); | ||
INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); | ||
INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); | ||
INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); | ||
INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); | ||
ROLLBACK; | ||
SELECT COUNT(*) = 35 FROM t1; | ||
COUNT(*) = 35 | ||
1 | ||
SELECT COUNT(*) = 0 FROM (SELECT COUNT(*) AS c, f1 FROM t1 GROUP BY f1 HAVING c NOT IN (5, 10)) AS a1; | ||
COUNT(*) = 0 | ||
1 | ||
COMMIT; | ||
SET AUTOCOMMIT=ON; | ||
SELECT COUNT(*) = 35 FROM t1; | ||
COUNT(*) = 35 | ||
1 | ||
SELECT COUNT(*) = 0 FROM (SELECT COUNT(*) AS c, f1 FROM t1 GROUP BY f1 HAVING c NOT IN (5, 10)) AS a1; | ||
COUNT(*) = 0 | ||
1 | ||
DROP TABLE t1; | ||
COMMIT; | ||
SET AUTOCOMMIT=ON; | ||
CALL mtr.add_suppression("Slave SQL: Error 'The MySQL server is running with the --skip-grant-tables option so it cannot execute this statement' on query"); | ||
DROP USER sst; | ||
CALL mtr.add_suppression("Slave SQL: Error 'The MySQL server is running with the --skip-grant-tables option so it cannot execute this statement' on query"); | ||
CALL mtr.add_suppression("InnoDB: Error: Table \"mysql\"\\.\"innodb_index_stats\" not found"); | ||
CALL mtr.add_suppression("InnoDB: New log files created"); | ||
CALL mtr.add_suppression("InnoDB: Creating foreign key constraint system tables"); | ||
CALL mtr.add_suppression("Can't open and lock time zone table"); | ||
CALL mtr.add_suppression("Can't open and lock privilege tables"); | ||
CALL mtr.add_suppression("Info table is not ready to be used"); | ||
CALL mtr.add_suppression("Native table .* has the wrong structure"); | ||
DROP USER sslsst; |
22 changes: 22 additions & 0 deletions
22
mysql-test/suite/galera/t/galera_sst_mysqldump_with_key.cnf
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
!include ../galera_2nodes.cnf | ||
|
||
# We do not set mysqldump-related SST options here because doing so on startup | ||
# causes the first MTR connection to be forefully dropped by Galera, which in turn confuses MTR | ||
|
||
[mysqld.1] | ||
wsrep_provider_options='base_port=@mysqld.1.#galera_port;gcache.size=1;pc.ignore_sb=true' | ||
|
||
[mysqld.2] | ||
wsrep_provider_options='base_port=@mysqld.2.#galera_port;gcache.size=1;pc.ignore_sb=true' | ||
|
||
[mysqld] | ||
wsrep_debug=ON | ||
|
||
ssl-ca=@ENV.MYSQL_TEST_DIR/std_data/galera-cert.pem | ||
ssl-cert=@ENV.MYSQL_TEST_DIR/std_data/galera-cert.pem | ||
ssl-key=@ENV.MYSQL_TEST_DIR/std_data/galera-key.pem | ||
|
||
[client] | ||
ssl-ca=@ENV.MYSQL_TEST_DIR/std_data/cacert.pem | ||
ssl-cert=@ENV.MYSQL_TEST_DIR/std_data/client-cert.pem | ||
ssl-key=@ENV.MYSQL_TEST_DIR/std_data/client-key.pem |
22 changes: 22 additions & 0 deletions
22
mysql-test/suite/galera/t/galera_sst_mysqldump_with_key.test
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
# | ||
# Test mysqldump SST with client SSL key. See galera_sst_mysqldump_with_key.cnf for the configuration on the client side. | ||
# | ||
|
||
--source include/big_test.inc | ||
--source include/galera_cluster.inc | ||
--source include/have_innodb.inc | ||
--source include/have_openssl.inc | ||
|
||
--source suite/galera/include/galera_sst_set_mysqldump.inc | ||
|
||
--connection node_1 | ||
CREATE USER sslsst; | ||
GRANT ALL PRIVILEGES ON *.* TO sslsst; | ||
GRANT USAGE ON *.* TO sslsst REQUIRE SSL; | ||
|
||
SET GLOBAL wsrep_sst_auth = 'sslsst:'; | ||
|
||
--source suite/galera/include/galera_st_disconnect_slave.inc | ||
|
||
--source suite/galera/include/galera_sst_restore.inc | ||
DROP USER sslsst; |