database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

MDEV-6981: feature request MASTER_GTID_WAIT status variables

Browse Source 
Review fixes:
 - Coding style
 - Fix bad .result file
 - Fix test to be tolerant of different timing.
 - Fix test to give better info in case of unexpected timing.
This commit is contained in:
Kristian Nielsen
2015-03-16 14:40:29 +01:00
parent 0e717c5bf4
commit ef4d8db5ec
4 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mysql-test/suite/rpl/r/rpl_gtid_basic.result
View File

@ -295,9 +295,11 @@ Master_gtid_wait_timeouts 0
SHOW STATUS LIKE 'Master_gtid_wait_count'; SHOW STATUS LIKE 'Master_gtid_wait_count';
Variable_name Value Variable_name Value
Master_gtid_wait_count 4 Master_gtid_wait_count 4
SELECT MASTER_GTID_WAIT_TIME <= 1000000 AS Master_gtid_wait_less_than_second; SET @a= MASTER_GTID_WAIT_TIME;
Master_gtid_wait_less_than_second SELECT IF(@a <= 100*1000*1000, "OK", CONCAT("Error: wait time ", @a, " is larger than expected"))
1 AS Master_gtid_wait_time_as_expected;
Master_gtid_wait_time_as_expected
OK
SELECT master_gtid_wait('0-1-109'); SELECT master_gtid_wait('0-1-109');
SHOW STATUS LIKE 'Master_gtid_wait_timeouts'; SHOW STATUS LIKE 'Master_gtid_wait_timeouts';
Variable_name Value Variable_name Value
@ -314,9 +316,10 @@ Master_gtid_wait_timeouts 1
SHOW STATUS LIKE 'Master_gtid_wait_count'; SHOW STATUS LIKE 'Master_gtid_wait_count';
Variable_name Value Variable_name Value
Master_gtid_wait_count 5 Master_gtid_wait_count 5
SELECT MASTER_GTID_WAIT_TIME BETWEEN 500000 AND 3000000 AS Master_gtid_wait_time_between_half_and_3_seconds; SET @a= MASTER_GTID_WAIT_TIME;
Master_gtid_wait_time_between_half_and_3_seconds SELECT IF(@a BETWEEN 0.4*1000*1000 AND 100*1000*1000, "OK", CONCAT("Error: wait time ", @a, " not as expected")) AS Master_gtid_wait_time_as_expected;
1 Master_gtid_wait_time_as_expected
OK
KILL QUERY KILL_ID; KILL QUERY KILL_ID;
ERROR 70100: Query execution was interrupted ERROR 70100: Query execution was interrupted
SET gtid_domain_id=2; SET gtid_domain_id=2;
@ -472,5 +475,6 @@ a
31 31
32 32
33 33
34
DROP TABLE t1; DROP TABLE t1;
include/rpl_end.inc include/rpl_end.inc

13
mysql-test/suite/rpl/t/rpl_gtid_basic.test
View File

@ -309,7 +309,7 @@ send SELECT master_gtid_wait('2-1-5,1-1-4,0-1-110');
send SELECT master_gtid_wait('2-1-2'); send SELECT master_gtid_wait('2-1-2');
--connection server_2 --connection server_2
# This one completes immediately ( < 1 ms). # This one completes immediately.
SHOW STATUS LIKE 'Master_gtid_wait_timeouts'; SHOW STATUS LIKE 'Master_gtid_wait_timeouts';
SHOW STATUS LIKE 'Master_gtid_wait_count'; SHOW STATUS LIKE 'Master_gtid_wait_count';
SELECT master_gtid_wait('1-1-1'); SELECT master_gtid_wait('1-1-1');
@ -317,7 +317,9 @@ SHOW STATUS LIKE 'Master_gtid_wait_timeouts';
SHOW STATUS LIKE 'Master_gtid_wait_count'; SHOW STATUS LIKE 'Master_gtid_wait_count';
let $wait_time = query_get_value(SHOW STATUS LIKE 'Master_gtid_wait_time', Value, 1); let $wait_time = query_get_value(SHOW STATUS LIKE 'Master_gtid_wait_time', Value, 1);
--replace_result $wait_time MASTER_GTID_WAIT_TIME --replace_result $wait_time MASTER_GTID_WAIT_TIME
eval SELECT $wait_time <= 1000000 AS Master_gtid_wait_less_than_second; eval SET @a= $wait_time;
SELECT IF(@a <= 100*1000*1000, "OK", CONCAT("Error: wait time ", @a, " is larger than expected"))
AS Master_gtid_wait_time_as_expected;
--connect (s10,127.0.0.1,root,,test,$SERVER_MYPORT_2,) --connect (s10,127.0.0.1,root,,test,$SERVER_MYPORT_2,)
@ -330,10 +332,13 @@ SHOW STATUS LIKE 'Master_gtid_wait_count';
SELECT master_gtid_wait('2-1-2', 0.5); SELECT master_gtid_wait('2-1-2', 0.5);
SHOW STATUS LIKE 'Master_gtid_wait_timeouts'; SHOW STATUS LIKE 'Master_gtid_wait_timeouts';
SHOW STATUS LIKE 'Master_gtid_wait_count'; SHOW STATUS LIKE 'Master_gtid_wait_count';
# (0.5-3 seconds)
let $wait_time = query_get_value(SHOW STATUS LIKE 'Master_gtid_wait_time', Value, 1); let $wait_time = query_get_value(SHOW STATUS LIKE 'Master_gtid_wait_time', Value, 1);
--replace_result $wait_time MASTER_GTID_WAIT_TIME --replace_result $wait_time MASTER_GTID_WAIT_TIME
eval SELECT $wait_time BETWEEN 500000 AND 3000000 AS Master_gtid_wait_time_between_half_and_3_seconds; eval SET @a= $wait_time;
# We expect a wait time of just a bit over 0.5 seconds. But thread scheduling
# and timer inaccuracies could introduce significant jitter. So allow a
# generous interval.
SELECT IF(@a BETWEEN 0.4*1000*1000 AND 100*1000*1000, "OK", CONCAT("Error: wait time ", @a, " not as expected")) AS Master_gtid_wait_time_as_expected;
--replace_result $kill1_id KILL_ID --replace_result $kill1_id KILL_ID
eval KILL QUERY $kill1_id; eval KILL QUERY $kill1_id;

8
sql/rpl_gtid.cc
View File

@ -2011,7 +2011,7 @@ gtid_waiting::wait_for_pos(THD *thd, String *gtid_str, longlong timeout_us)
return 1; return 1;
} }
status_var_increment(thd->status_var.master_gtid_wait_count); status_var_increment(thd->status_var.master_gtid_wait_count);
before = microsecond_interval_timer(); before= microsecond_interval_timer();
if (timeout_us >= 0) if (timeout_us >= 0)
{ {
@ -2030,8 +2030,10 @@ gtid_waiting::wait_for_pos(THD *thd, String *gtid_str, longlong timeout_us)
{ {
case -1: case -1:
status_var_increment(thd->status_var.master_gtid_wait_timeouts); status_var_increment(thd->status_var.master_gtid_wait_timeouts);
case 0: /* deliberate fall through */ /* Deliberate fall through. */
status_var_add(thd->status_var.master_gtid_wait_time, microsecond_interval_timer() - before); case 0:
status_var_add(thd->status_var.master_gtid_wait_time,
microsecond_interval_timer() - before);
} }
my_free(wait_pos); my_free(wait_pos);
return err; return err;

4
sql/sql_class.h
View File

@ -739,8 +739,8 @@ typedef struct system_status_var
ulong feature_xml; /* +1 when XPATH is used */ ulong feature_xml; /* +1 when XPATH is used */
/* From MASTER_GTID_WAIT usage */ /* From MASTER_GTID_WAIT usage */
ulonglong master_gtid_wait_timeouts; /* # of timeouts */ ulonglong master_gtid_wait_timeouts; /* Number of timeouts */
ulonglong master_gtid_wait_time; /* Time in microseconds */ ulonglong master_gtid_wait_time; /* Time in microseconds */
ulonglong master_gtid_wait_count; ulonglong master_gtid_wait_count;
ulong empty_queries; ulong empty_queries;