Commit 7fdb7d40 authored by Sergei Golubchik's avatar Sergei Golubchik

more sst test failures

* xtrabackup no longer support --compact
* wsrep_sst_mysqldump wasn't always using --default-file
* wsrep_sst.cc overquoted --default-file for wsrep_sst_mysqldump

also remove redundant lines config and test lines, compiler warnings,
and mark big tests as big.
parent 93ab0eff
Setting SST method to mysqldump ... Setting SST method to mysqldump ...
call mtr.add_suppression("WSREP: wsrep_sst_method is set to 'mysqldump' yet mysqld bind_address is set to '127.0.0.1'");
call mtr.add_suppression("Failed to load slave replication state from table mysql.gtid_slave_pos");
CREATE USER 'sst'; CREATE USER 'sst';
GRANT ALL PRIVILEGES ON *.* TO 'sst'; GRANT ALL PRIVILEGES ON *.* TO 'sst';
SET GLOBAL wsrep_sst_auth = 'sst:'; SET GLOBAL wsrep_sst_auth = 'sst:';
...@@ -105,5 +107,3 @@ CALL mtr.add_suppression("Can't open and lock privilege tables"); ...@@ -105,5 +107,3 @@ 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("Info table is not ready to be used");
CALL mtr.add_suppression("Native table .* has the wrong structure"); CALL mtr.add_suppression("Native table .* has the wrong structure");
DROP USER sslsst; DROP USER sslsst;
SET GLOBAL general_log = ON;
SET GLOBAL slow_query_log = ON;
--source include/big_test.inc
--source include/galera_cluster.inc --source include/galera_cluster.inc
--source include/have_innodb.inc --source include/have_innodb.inc
--source include/have_mariabackup.inc --source include/have_mariabackup.inc
......
--source include/big_test.inc
--source include/galera_cluster.inc --source include/galera_cluster.inc
--source suite/galera/include/galera_sst_set_mysqldump.inc --source suite/galera/include/galera_sst_set_mysqldump.inc
......
...@@ -12,10 +12,6 @@ wsrep_provider_options='base_port=@mysqld.2.#galera_port;gcache.size=1;pc.ignore ...@@ -12,10 +12,6 @@ wsrep_provider_options='base_port=@mysqld.2.#galera_port;gcache.size=1;pc.ignore
[mysqld] [mysqld]
wsrep_debug=ON 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] [client]
ssl-ca=@ENV.MYSQL_TEST_DIR/std_data/cacert.pem ssl-ca=@ENV.MYSQL_TEST_DIR/std_data/cacert.pem
ssl-cert=@ENV.MYSQL_TEST_DIR/std_data/client-cert.pem ssl-cert=@ENV.MYSQL_TEST_DIR/std_data/client-cert.pem
......
...@@ -5,9 +5,12 @@ ...@@ -5,9 +5,12 @@
--source include/big_test.inc --source include/big_test.inc
--source include/galera_cluster.inc --source include/galera_cluster.inc
--source include/have_innodb.inc --source include/have_innodb.inc
--source include/have_openssl.inc --source include/have_ssl_communication.inc
--source suite/galera/include/galera_sst_set_mysqldump.inc --source suite/galera/include/galera_sst_set_mysqldump.inc
--let $node_1=node_1
--let $node_2=node_2
--source include/auto_increment_offset_save.inc
--connection node_1 --connection node_1
CREATE USER sslsst; CREATE USER sslsst;
...@@ -18,12 +21,7 @@ SET GLOBAL wsrep_sst_auth = 'sslsst:'; ...@@ -18,12 +21,7 @@ SET GLOBAL wsrep_sst_auth = 'sslsst:';
--source suite/galera/include/galera_st_disconnect_slave.inc --source suite/galera/include/galera_st_disconnect_slave.inc
--source include/auto_increment_offset_restore.inc
--source suite/galera/include/galera_sst_restore.inc --source suite/galera/include/galera_sst_restore.inc
DROP USER sslsst;
--connection node_2
# We have to manually restore global_log and slow_query_log due to mysql-wsrep#108
# Otherwise MTR's check_testcases complains
SET GLOBAL general_log = ON; DROP USER sslsst;
SET GLOBAL slow_query_log = ON;
--source include/big_test.inc
--source include/galera_cluster.inc --source include/galera_cluster.inc
--let $node_1=node_1 --let $node_1=node_1
......
...@@ -8,7 +8,7 @@ wsrep_debug=ON ...@@ -8,7 +8,7 @@ wsrep_debug=ON
[xtrabackup] [xtrabackup]
backup-locks backup-locks
close-files close-files
compact #compact - disabled in xtrabackup 2.4, https://bugs.launchpad.net/percona-xtrabackup/+bug/1192834/comments/29
# compression requires qpress from the Percona repositories # compression requires qpress from the Percona repositories
# compress # compress
# compress-threads=2 # compress-threads=2
......
--source include/big_test.inc
--source include/galera_cluster.inc --source include/galera_cluster.inc
--source include/have_innodb.inc --source include/have_innodb.inc
--source include/have_xtrabackup.inc --source include/have_xtrabackup.inc
......
...@@ -108,11 +108,6 @@ then ...@@ -108,11 +108,6 @@ then
DROP PREPARE stmt;" DROP PREPARE stmt;"
fi fi
# Retrieve the donor's @@global.gtid_binlog_state.
GTID_BINLOG_STATE=$(echo "SHOW GLOBAL VARIABLES LIKE 'gtid_binlog_state'" |\
$MYSQL_CLIENT $AUTH -S$WSREP_SST_OPT_SOCKET --disable-reconnect --connect_timeout=10 |\
tail -1 | awk -F ' ' '{ print $2 }')
MYSQL="$MYSQL_CLIENT $WSREP_SST_OPT_CONF "\ MYSQL="$MYSQL_CLIENT $WSREP_SST_OPT_CONF "\
"$AUTH -h${WSREP_SST_OPT_HOST_UNESCAPED} "\ "$AUTH -h${WSREP_SST_OPT_HOST_UNESCAPED} "\
"-P$WSREP_SST_OPT_PORT --disable-reconnect --connect_timeout=10" "-P$WSREP_SST_OPT_PORT --disable-reconnect --connect_timeout=10"
...@@ -126,12 +121,16 @@ tail -1 | awk -F ' ' '{ print $2 }') ...@@ -126,12 +121,16 @@ tail -1 | awk -F ' ' '{ print $2 }')
SERVER_VERSION=$(echo "set statement wsrep_sync_wait=0 for SHOW VARIABLES LIKE 'version'" | $MYSQL |\ SERVER_VERSION=$(echo "set statement wsrep_sync_wait=0 for SHOW VARIABLES LIKE 'version'" | $MYSQL |\
tail -1 | awk -F ' ' '{ print $2 }') tail -1 | awk -F ' ' '{ print $2 }')
# Retrieve the donor's @@global.gtid_binlog_state.
GTID_BINLOG_STATE=$(echo "SHOW GLOBAL VARIABLES LIKE 'gtid_binlog_state'" | $MYSQL |\
tail -1 | awk -F ' ' '{ print $2 }')
RESET_MASTER="" RESET_MASTER=""
SET_GTID_BINLOG_STATE="" SET_GTID_BINLOG_STATE=""
SQL_LOG_BIN_OFF="" SQL_LOG_BIN_OFF=""
# Safety check # Safety check
if [ ${SERVER_VERSION%%.*} != '5' ] if [ "${SERVER_VERSION%%.*}" != '5' ]
then then
# If binary logging is enabled on the joiner node, we need to copy donor's # If binary logging is enabled on the joiner node, we need to copy donor's
# gtid_binlog_state to joiner. In order to do that, a RESET MASTER must be # gtid_binlog_state to joiner. In order to do that, a RESET MASTER must be
...@@ -146,7 +145,7 @@ then ...@@ -146,7 +145,7 @@ then
fi fi
# NOTE: we don't use --routines here because we're dumping mysql.proc table # NOTE: we don't use --routines here because we're dumping mysql.proc table
MYSQLDUMP="$MYSQLDUMP $AUTH -S$WSREP_SST_OPT_SOCKET \ MYSQLDUMP="$MYSQLDUMP $WSREP_SST_OPT_CONF $AUTH -S$WSREP_SST_OPT_SOCKET \
--add-drop-database --add-drop-table --skip-add-locks --create-options \ --add-drop-database --add-drop-table --skip-add-locks --create-options \
--disable-keys --extended-insert --skip-lock-tables --quick --set-charset \ --disable-keys --extended-insert --skip-lock-tables --quick --set-charset \
--skip-comments --flush-privileges --all-databases --events" --skip-comments --flush-privileges --all-databases --events"
......
...@@ -556,11 +556,11 @@ static ssize_t sst_prepare_other (const char* method, ...@@ -556,11 +556,11 @@ static ssize_t sst_prepare_other (const char* method,
ret= snprintf (cmd_str(), cmd_len, ret= snprintf (cmd_str(), cmd_len,
"wsrep_sst_%s " "wsrep_sst_%s "
WSREP_SST_OPT_ROLE" 'joiner' " WSREP_SST_OPT_ROLE " 'joiner' "
WSREP_SST_OPT_ADDR" '%s' " WSREP_SST_OPT_ADDR " '%s' "
WSREP_SST_OPT_DATA" '%s' " WSREP_SST_OPT_DATA " '%s' "
" %s " " %s "
WSREP_SST_OPT_PARENT" '%d'" WSREP_SST_OPT_PARENT " '%d'"
" %s '%s' ", " %s '%s' ",
method, addr_in, mysql_real_data_home, method, addr_in, mysql_real_data_home,
wsrep_defaults_file, wsrep_defaults_file,
...@@ -842,13 +842,13 @@ static int sst_donate_mysqldump (const char* addr, ...@@ -842,13 +842,13 @@ static int sst_donate_mysqldump (const char* addr,
int ret= snprintf (cmd_str(), cmd_len, int ret= snprintf (cmd_str(), cmd_len,
"wsrep_sst_mysqldump " "wsrep_sst_mysqldump "
WSREP_SST_OPT_ADDR" '%s' " WSREP_SST_OPT_ADDR " '%s' "
WSREP_SST_OPT_PORT" '%d' " WSREP_SST_OPT_PORT " '%d' "
WSREP_SST_OPT_LPORT" '%u' " WSREP_SST_OPT_LPORT " '%u' "
WSREP_SST_OPT_SOCKET" '%s' " WSREP_SST_OPT_SOCKET " '%s' "
" '%s' " " %s "
WSREP_SST_OPT_GTID" '%s:%lld' " WSREP_SST_OPT_GTID " '%s:%lld' "
WSREP_SST_OPT_GTID_DOMAIN_ID" '%d'" WSREP_SST_OPT_GTID_DOMAIN_ID " '%d'"
"%s", "%s",
addr, port, mysqld_port, mysqld_unix_port, addr, port, mysqld_port, mysqld_unix_port,
wsrep_defaults_file, uuid_str, wsrep_defaults_file, uuid_str,
...@@ -1205,14 +1205,14 @@ static int sst_donate_other (const char* method, ...@@ -1205,14 +1205,14 @@ static int sst_donate_other (const char* method,
ret= snprintf (cmd_str(), cmd_len, ret= snprintf (cmd_str(), cmd_len,
"wsrep_sst_%s " "wsrep_sst_%s "
WSREP_SST_OPT_ROLE" 'donor' " WSREP_SST_OPT_ROLE " 'donor' "
WSREP_SST_OPT_ADDR" '%s' " WSREP_SST_OPT_ADDR " '%s' "
WSREP_SST_OPT_SOCKET" '%s' " WSREP_SST_OPT_SOCKET " '%s' "
WSREP_SST_OPT_DATA" '%s' " WSREP_SST_OPT_DATA " '%s' "
" %s " " %s "
" %s '%s' " " %s '%s' "
WSREP_SST_OPT_GTID" '%s:%lld' " WSREP_SST_OPT_GTID " '%s:%lld' "
WSREP_SST_OPT_GTID_DOMAIN_ID" '%d'" WSREP_SST_OPT_GTID_DOMAIN_ID " '%d'"
"%s", "%s",
method, addr, mysqld_unix_port, mysql_real_data_home, method, addr, mysqld_unix_port, mysql_real_data_home,
wsrep_defaults_file, wsrep_defaults_file,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment