diff options
Diffstat (limited to 'mysql-test')
8 files changed, 464 insertions, 0 deletions
diff --git a/mysql-test/suite/binlog_encryption/multisource.result b/mysql-test/suite/binlog_encryption/multisource.result index 928c9799854..88753ccc8ae 100644 --- a/mysql-test/suite/binlog_encryption/multisource.result +++ b/mysql-test/suite/binlog_encryption/multisource.result @@ -179,6 +179,13 @@ Last_SQL_Errno = '0' Slave_heartbeat_period = '60.000' Slave_heartbeat_period = '60.000' # +# +# MDEV:16437: merge 5.7 P_S replication instrumentation and tables +# +SELECT * FROM performance_schema.replication_applier_status_by_coordinator; +CONNECTION_NAME THREAD_ID SERVICE_STATE LAST_SEEN_TRANSACTION LAST_ERROR_NUMBER LAST_ERROR_MESSAGE LAST_ERROR_TIMESTAMP LAST_TRANS_RETRY_COUNT +master1 # ON 0-1-7 0 0000-00-00 00:00:00 0 + # ON 0-2-4 0 0000-00-00 00:00:00 0 select * from db1.t1; i f1 1 one diff --git a/mysql-test/suite/multi_source/multisource.result b/mysql-test/suite/multi_source/multisource.result index 928c9799854..88753ccc8ae 100644 --- a/mysql-test/suite/multi_source/multisource.result +++ b/mysql-test/suite/multi_source/multisource.result @@ -179,6 +179,13 @@ Last_SQL_Errno = '0' Slave_heartbeat_period = '60.000' Slave_heartbeat_period = '60.000' # +# +# MDEV:16437: merge 5.7 P_S replication instrumentation and tables +# +SELECT * FROM performance_schema.replication_applier_status_by_coordinator; +CONNECTION_NAME THREAD_ID SERVICE_STATE LAST_SEEN_TRANSACTION LAST_ERROR_NUMBER LAST_ERROR_MESSAGE LAST_ERROR_TIMESTAMP LAST_TRANS_RETRY_COUNT +master1 # ON 0-1-7 0 0000-00-00 00:00:00 0 + # ON 0-2-4 0 0000-00-00 00:00:00 0 select * from db1.t1; i f1 1 one diff --git a/mysql-test/suite/multi_source/simple.result b/mysql-test/suite/multi_source/simple.result index bfb8e5de639..b57e146feb5 100644 --- a/mysql-test/suite/multi_source/simple.result +++ b/mysql-test/suite/multi_source/simple.result @@ -29,6 +29,13 @@ CONNECTION_NAME HOST PORT USER USING_GTID SSL_ALLOWED SSL_CA_FILE SSL_CA_PATH SS slave2 # # root NO NO NO 60 86400 60.000 slave1 # # root NO NO NO 60 86400 60.000 start all slaves; +# +# MDEV:16437: merge 5.7 P_S replication instrumentation and tables +# +select * from performance_schema.replication_applier_status_by_coordinator; +CONNECTION_NAME THREAD_ID SERVICE_STATE LAST_SEEN_TRANSACTION LAST_ERROR_NUMBER LAST_ERROR_MESSAGE LAST_ERROR_TIMESTAMP LAST_TRANS_RETRY_COUNT +slave2 # ON 0 0000-00-00 00:00:00 0 +slave1 # ON 0 0000-00-00 00:00:00 0 stop slave 'slave1'; show slave 'slave1' status; Slave_IO_State diff --git a/mysql-test/suite/multi_source/simple.test b/mysql-test/suite/multi_source/simple.test index 8c25f8be917..2ef6f451cf6 100644 --- a/mysql-test/suite/multi_source/simple.test +++ b/mysql-test/suite/multi_source/simple.test @@ -57,6 +57,12 @@ select * from performance_schema.replication_connection_configuration; # Ensure that start all slaves doesn't do anything as all slaves are started start all slaves; +--echo # +--echo # MDEV:16437: merge 5.7 P_S replication instrumentation and tables +--echo # +--replace_column 2 # +select * from performance_schema.replication_applier_status_by_coordinator; + stop slave 'slave1'; --replace_result $SERVER_MYPORT_1 MYPORT_1 $SERVER_MYPORT_2 MYPORT_2 $read_master_log_pos <read_master_log_pos> $relay_log_pos <relay_log_pos> $relay_log_space1 <relay_log_space1> $relay_log_space2 <relay_log_space2> diff --git a/mysql-test/suite/rpl/include/multisource.inc b/mysql-test/suite/rpl/include/multisource.inc index bbdf373f794..4088ecc77d7 100644 --- a/mysql-test/suite/rpl/include/multisource.inc +++ b/mysql-test/suite/rpl/include/multisource.inc @@ -263,6 +263,12 @@ let $condition= = 'Waiting for master to send event'; --let $all_slaves_status= --echo # +--echo # +--echo # MDEV:16437: merge 5.7 P_S replication instrumentation and tables +--echo # +--replace_column 2 # +SELECT * FROM performance_schema.replication_applier_status_by_coordinator; + --sorted_result select * from db1.t1; diff --git a/mysql-test/suite/rpl/r/rpl_perfschema_applier_status_by_coordinator.result b/mysql-test/suite/rpl/r/rpl_perfschema_applier_status_by_coordinator.result new file mode 100644 index 00000000000..88e1848d46e --- /dev/null +++ b/mysql-test/suite/rpl/r/rpl_perfschema_applier_status_by_coordinator.result @@ -0,0 +1,114 @@ +include/master-slave.inc +[connection master] +call mtr.add_suppression("Error 'Table 'test.t' doesn't exist' on query."); +include/assert.inc [On master, the table should return an empty set.] +connection slave; +include/wait_for_slave_param.inc [Slave_SQL_Running_State] + +# Testing on fresh slave. + +include/assert.inc [thread_name should should indicate sql thread.] +include/assert.inc [SSS shows Slave_IO_Running as "Yes". So, Service_State from this PS table should be "ON".] +include/assert.inc [Value returned by SSS and PS table for Last_Error_Number should be same.] +include/assert.inc [Value returned by SSS and PS table for Last_Error_Message should be same.] +include/assert.inc [Value returned by SSS and PS table for Last_Error_Timestamp should be 0000-00-00 00:00:00.] +include/assert.inc [Last_trans_retry_count should be 0.] + +# Cause an error in the SQL thread and check for the correctness of +# values in error number, message and timestamp fields. + +connection master; +use test; +create table t(a int primary key); +include/sync_slave_sql_with_master.inc +drop table t; +connection master; +insert into t values(1); +connection slave; +include/wait_for_slave_sql_error.inc [errno=1146] + +# Extract the error related fields from SSS and PS table and compare +# them for correctness. + +include/assert.inc [Value returned by SSS and PS table for Last_Error_Number should be same.] +Value returned by SSS and PS table for Last_Error_Message is same. + +# Verify that the error fields are preserved after STOP SLAVE, thread_id +# changes to NULL and service_state changes to "Off". + + +# 1. Verify that thread_id changes to NULL and service_state to "off" on +# STOP SLAVE. + +include/assert.inc [After STOP SLAVE, thread_id should be NULL] +include/assert.inc [SSS shows Slave_SQL_Running as "No". So, Service_State from this PS table should be "OFF".] + +# 2. Extract the error related fields from SSS and PS table and compare +# them. These fields should preserve their values. + +include/assert.inc [Value returned by SSS and PS table for Last_Error_Number should be same.] +Value returned by SSS and PS table for Last_Error_Message is same. +connection master; +drop table t; +reset master; +connection slave; +include/stop_slave.inc +reset slave; +reset master; +set @saved_slave_trans_retry_interval= @@GLOBAL.slave_transaction_retry_interval; +set global slave_transaction_retry_interval=1; +include/start_slave.inc +# +# Test Last_Trans_Retry_Count value. +# +connection master; +create table t1 (f int primary key) engine=innodb; +insert into t1 values (10); +connection slave; +connect slave2,127.0.0.1,root,,test,$SLAVE_MYPORT,; +connection slave2; +begin; +update t1 set f=40 where f=10; +connection master; +begin; +update t1 set f=60 where f=10; +commit; +connection slave; +connection slave2; +rollback; +include/assert.inc [Value returned by PS table for Last_Trans_Retry_Count should be > 0.] +connection master; +drop table t1; +connection slave; +disconnect slave2; +set global slave_transaction_retry_interval=@saved_slave_trans_retry_interval; +include/stop_slave.inc + +# Restarting servers and setting up MTS now. Since, SQL thread and +# coordinator are the same and follow same code path, we can skip +# testing for coordinator thread in all scenarios. Testing for one +# scenario is enough. + +include/rpl_restart_server.inc [server_number=1] +include/rpl_restart_server.inc [server_number=2] +connection slave; +change master to +master_host='127.0.0.1', +master_port=MASTER_MYPORT, +master_user='root'; +SET @save.slave_parallel_workers=@@global.slave_parallel_workers; +SET @@global.slave_parallel_workers=1; +set @save.slave_transaction_retries= @@global.slave_transaction_retries; +include/start_slave.inc +include/wait_for_slave_param.inc [Slave_SQL_Running_State] +include/assert.inc [thread_name should should indicate sql thread.] +include/assert.inc [SSS shows Slave_SQL_Running as "Yes". So, Service_State from this PS table should be "ON".] +include/assert.inc [Value returned by SSS and PS table for Last_Error_Number should be same.] + +# Cleanup. + +include/stop_slave.inc +set @@global.slave_parallel_workers= @save.slave_parallel_workers; +set @@global.slave_transaction_retries= @save.slave_transaction_retries; +include/start_slave.inc +include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_perfschema_applier_status_by_coordinator-slave.opt b/mysql-test/suite/rpl/t/rpl_perfschema_applier_status_by_coordinator-slave.opt new file mode 100644 index 00000000000..3f82baff598 --- /dev/null +++ b/mysql-test/suite/rpl/t/rpl_perfschema_applier_status_by_coordinator-slave.opt @@ -0,0 +1 @@ +--loose-innodb-lock-wait-timeout=1 diff --git a/mysql-test/suite/rpl/t/rpl_perfschema_applier_status_by_coordinator.test b/mysql-test/suite/rpl/t/rpl_perfschema_applier_status_by_coordinator.test new file mode 100644 index 00000000000..e00b486c1f2 --- /dev/null +++ b/mysql-test/suite/rpl/t/rpl_perfschema_applier_status_by_coordinator.test @@ -0,0 +1,316 @@ +# ==== Purpose ==== +# +# This test script serves as the functionality testing for the table +# performance_schema.replication_applier_status_by_coordinator. Test +# for ddl and dml operations is a part of the perfschema suite. +# The ddl/dml tests are named: +# 1) ddl_replication_connection_configuration.test and +# 2) dml_replication_connection_configuration.test. +# +# This test script does the following: + +# - Verify that SELECT works for every field in the table. +# - The SELECT per field produces an output similar to the corresponding field +# in SHOW SLAVE STATUS(SSS), if there is one. +# - If there is no matching field in SSS, we resort to other method of testing +# those fields. +# - We perform all the testing on connection "slave". On master, the table +# returns an empty set. +# +# The follwing scenarios are tested in this test script: +# +# - Test each field in STS on a fresh replication setup. +# - Change configuration parameters using CHANGE MASTER TO and verify that +# these changes are seen in SELECTs from PS table. +# - Verify that, the change in values are correctly shown by the table. +# - Verify that the values are preserved after STOP SLAVE, thread_id +# changes to NULL and service_state changes to "Off". +# - A priliminary test for Multi-threaded slave(MTS) mode. +# +# ==== Reference ==== +# +# MDEV:16437: merge 5.7 P_S replication instrumentation and tables +# +--source include/have_innodb.inc +--source include/have_binlog_format_mixed.inc +--source include/master-slave.inc + +call mtr.add_suppression("Error 'Table 'test.t' doesn't exist' on query."); + +let $assert_text= On master, the table should return an empty set.; +let $assert_cond= count(*) = 0 from performance_schema.replication_applier_status_by_coordinator; +source include/assert.inc; + +--connection slave + +--let $slave_param= Slave_SQL_Running_State +--let $slave_param_value= Slave has read all relay log; waiting for more updates +source include/wait_for_slave_param.inc; + +--echo +--echo # Testing on fresh slave. +--echo + +# To verify the correctness of thread_id field, we check for the name of +# the thread. +let $thread_name= `select name from performance_schema.threads where thread_id= (select Thread_Id from performance_schema.replication_applier_status_by_coordinator)`; +let $assert_text= thread_name should should indicate sql thread.; +let $assert_cond= "$thread_name" = "thread/sql/slave_sql"; +source include/assert.inc; + +let $sss_value= query_get_value(SHOW SLAVE STATUS, Slave_SQL_Running, 1); +let $ps_value= query_get_value(select Service_State from performance_schema.replication_applier_status_by_coordinator, Service_State, 1); +let $assert_text= SSS shows Slave_IO_Running as "Yes". So, Service_State from this PS table should be "ON".; +let $assert_cond= "$sss_value" = "Yes" AND "$ps_value"= "ON"; +source include/assert.inc; + +let $sss_value= query_get_value(SHOW SLAVE STATUS, Last_SQL_Errno, 1); +let $ps_value= query_get_value(select Last_Error_Number from performance_schema.replication_applier_status_by_coordinator, Last_Error_Number, 1); +let $assert_text= Value returned by SSS and PS table for Last_Error_Number should be same.; +let $assert_cond= "$sss_value" = "$ps_value"; +source include/assert.inc; + +let $sss_value= query_get_value(SHOW SLAVE STATUS, Last_SQL_Error, 1); +let $ps_value= query_get_value(select Last_Error_Message from performance_schema.replication_applier_status_by_coordinator, Last_Error_Message, 1); +let $assert_text= Value returned by SSS and PS table for Last_Error_Message should be same.; +let $assert_cond= "$sss_value" = "$ps_value"; +source include/assert.inc; + +let $ps_value= query_get_value(select Last_Error_Timestamp from performance_schema.replication_applier_status_by_coordinator, Last_Error_Timestamp, 1); +let $assert_text= Value returned by SSS and PS table for Last_Error_Timestamp should be 0000-00-00 00:00:00.; +let $assert_cond= "$ps_value" = "0000-00-00 00:00:00"; +source include/assert.inc; + +let $ps_value= query_get_value(select Last_Trans_Retry_Count from performance_schema.replication_applier_status_by_coordinator, Last_Trans_Retry_Count, 1); +let $assert_text= Last_trans_retry_count should be 0.; +let $assert_cond= "$ps_value"= 0; +source include/assert.inc; + +--echo +--echo # Cause an error in the SQL thread and check for the correctness of +--echo # values in error number, message and timestamp fields. +--echo + +# Cause an error in SQL thread. +# 1) Ceate a table 't' at master, replicate at slave. +# 2) Drop table 't' at slave only. +# 3) Insert a value in table 't' on master and replicate on slave. +# Since slave doesnt have table 't' anymore, SQL thread will show an error. + +--connection master +use test; +create table t(a int primary key); +--source include/sync_slave_sql_with_master.inc +drop table t; +--connection master +insert into t values(1); +--connection slave +let $slave_sql_errno=1146; +source include/wait_for_slave_sql_error.inc; + +--echo +--echo # Extract the error related fields from SSS and PS table and compare +--echo # them for correctness. +--echo + +let $sss_value= query_get_value(SHOW SLAVE STATUS, Last_SQL_Errno, 1); +let $ps_value= query_get_value(select Last_Error_Number from performance_schema.replication_applier_status_by_coordinator, Last_Error_Number, 1); +let $assert_text= Value returned by SSS and PS table for Last_Error_Number should be same.; +let $assert_cond= "$sss_value" = "$ps_value"; +source include/assert.inc; + +# Availability of special characters like single quote and backtick character +# makes it difficult use the assert.inc or mysql functionstrcmp(). +# So, the equality of error messages is checked using the below perl code. + +let $sss_value= query_get_value(SHOW SLAVE STATUS, Last_SQL_Error, 1); +let $ps_value= query_get_value(select Last_Error_Message from performance_schema.replication_applier_status_by_coordinator, Last_Error_Message, 1); + +let PS_VALUE= $ps_value; +let SSS_VALUE= $sss_value; + +perl; +use strict; +my $ps_value= $ENV{'PS_VALUE'}; +my $sss_value= $ENV{'SSS_VALUE'}; + +if ($ps_value eq $sss_value) +{ + print "Value returned by SSS and PS table for Last_Error_Message is same.\n"; +} +else +{ + print "Value returned by SSS and PS table for Last_Error_Message is NOT same\n"; +} +EOF + +--echo +--echo # Verify that the error fields are preserved after STOP SLAVE, thread_id +--echo # changes to NULL and service_state changes to "Off". +--echo + +--echo +--echo # 1. Verify that thread_id changes to NULL and service_state to "off" on +--echo # STOP SLAVE. +--echo + +let $ps_value= query_get_value(select thread_id from performance_schema.replication_applier_status_by_coordinator, thread_id, 1); +let $assert_text= After STOP SLAVE, thread_id should be NULL; +let $assert_cond= "$ps_value" = "NULL"; +source include/assert.inc; + +let $sss_value= query_get_value(SHOW SLAVE STATUS, Slave_SQL_Running, 1); +let $ps_value= query_get_value(select Service_State from performance_schema.replication_applier_status_by_coordinator, Service_State, 1); +let $assert_text= SSS shows Slave_SQL_Running as "No". So, Service_State from this PS table should be "OFF".; +let $assert_cond= "$sss_value" = "No" AND "$ps_value"= "OFF"; +source include/assert.inc; + +--echo +--echo # 2. Extract the error related fields from SSS and PS table and compare +--echo # them. These fields should preserve their values. +--echo + +let $sss_value= query_get_value(SHOW SLAVE STATUS, Last_SQL_Errno, 1); +let $ps_value= query_get_value(select Last_Error_Number from performance_schema.replication_applier_status_by_coordinator, Last_Error_Number, 1); +let $assert_text= Value returned by SSS and PS table for Last_Error_Number should be same.; +let $assert_cond= "$sss_value" = "$ps_value"; +source include/assert.inc; + +# Availability of special characters like single quote and backtick character +# makes it difficult use the assert.inc or mysql functionstrcmp(). +# So, the equality of error messages is checked using the below perl code. + +let $sss_value= query_get_value(SHOW SLAVE STATUS, Last_SQL_Error, 1); +let $ps_value= query_get_value(select Last_Error_Message from performance_schema.replication_applier_status_by_coordinator, Last_Error_Message, 1); + +let PS_VALUE= $ps_value; +let SSS_VALUE= $sss_value; + +perl; +use strict; +my $ps_value= $ENV{'PS_VALUE'}; +my $sss_value= $ENV{'SSS_VALUE'}; + +if ($ps_value eq $sss_value) +{ + print "Value returned by SSS and PS table for Last_Error_Message is same.\n"; +} +else +{ + print "Value returned by SSS and PS table for Last_Error_Message is NOT same\n"; +} +EOF + +# End of perl code for testing the error message. + +--connection master +drop table t; +reset master; + +--connection slave +--source include/stop_slave.inc +reset slave; +reset master; +set @saved_slave_trans_retry_interval= @@GLOBAL.slave_transaction_retry_interval; +set global slave_transaction_retry_interval=1; +--source include/start_slave.inc +# End of perl code for testing error message. + + +--echo # +--echo # Test Last_Trans_Retry_Count value. +--echo # + +--connection master +create table t1 (f int primary key) engine=innodb; +insert into t1 values (10); +--sync_slave_with_master +connect (slave2,127.0.0.1,root,,test,$SLAVE_MYPORT,); +--connection slave2 +begin; +update t1 set f=40 where f=10; + +--connection master +begin; +update t1 set f=60 where f=10; +commit; + +--connection slave +--let $wait_condition= SELECT COUNT(*) > 0 FROM information_schema.processlist WHERE Info = "update t1 set f=60 where f=10" +--source include/wait_condition.inc +sleep 4 ; +--connection slave2 +rollback; + +let $ps_value= query_get_value(select Last_Trans_Retry_Count from performance_schema.replication_applier_status_by_coordinator, Last_Trans_Retry_Count, 1); +let $assert_text= Value returned by PS table for Last_Trans_Retry_Count should be > 0.; +let $assert_cond= "$ps_value" > 0; +source include/assert.inc; + +--connection master +drop table t1; +--sync_slave_with_master +--disconnect slave2 +set global slave_transaction_retry_interval=@saved_slave_trans_retry_interval; + +source include/stop_slave.inc; + +--echo +--echo # Restarting servers and setting up MTS now. Since, SQL thread and +--echo # coordinator are the same and follow same code path, we can skip +--echo # testing for coordinator thread in all scenarios. Testing for one +--echo # scenario is enough. +--echo + +--let $rpl_server_number= 1 +--source include/rpl_restart_server.inc + +--let $rpl_server_number= 2 +--source include/rpl_restart_server.inc + +--connection slave +replace_result $MASTER_MYPORT MASTER_MYPORT; +replace_column 2 ###; +eval change master to + master_host='127.0.0.1', + master_port=$MASTER_MYPORT, + master_user='root'; +SET @save.slave_parallel_workers=@@global.slave_parallel_workers; +SET @@global.slave_parallel_workers=1; +# to avoid warnings +set @save.slave_transaction_retries= @@global.slave_transaction_retries; +source include/start_slave.inc; + +--let $slave_param= Slave_SQL_Running_State +--let $slave_param_value= Slave has read all relay log; waiting for more updates +source include/wait_for_slave_param.inc; + +# To verify the correctness of thread_id field, we check for the name of +# the thread. +let $thread_name= `select name from performance_schema.threads where thread_id= (select Thread_Id from performance_schema.replication_applier_status_by_coordinator)`; +let $assert_text= thread_name should should indicate sql thread.; +let $assert_cond= "$thread_name" = "thread/sql/slave_sql"; +source include/assert.inc; + +let $sss_value= query_get_value(SHOW SLAVE STATUS, Slave_SQL_Running, 1); +let $ps_value= query_get_value(select Service_State from performance_schema.replication_applier_status_by_coordinator, Service_State, 1); +let $assert_text= SSS shows Slave_SQL_Running as "Yes". So, Service_State from this PS table should be "ON".; +let $assert_cond= "$sss_value" = "Yes" AND "$ps_value"= "ON"; +source include/assert.inc; + +let $sss_value= query_get_value(SHOW SLAVE STATUS, Last_SQL_Errno, 1); +let $ps_value= query_get_value(select Last_Error_Number from performance_schema.replication_applier_status_by_coordinator, Last_Error_Number, 1); +let $assert_text= Value returned by SSS and PS table for Last_Error_Number should be same.; +let $assert_cond= "$sss_value" = "$ps_value"; +source include/assert.inc; + +--echo +--echo # Cleanup. +--echo + +source include/stop_slave.inc; +set @@global.slave_parallel_workers= @save.slave_parallel_workers; +set @@global.slave_transaction_retries= @save.slave_transaction_retries; +source include/start_slave.inc; + +source include/rpl_end.inc; |