Skip to content

Commit

Permalink
[mysql-5.6][PR] FB8-80: Display row information in processlist for rb…
Browse files Browse the repository at this point in the history 
…r threads

Summary:
Jira ticket: https://jira.percona.com/browse/FB8-80

Reference Patch: 564824a

Set row_query using the fields unpacked from the row event. Use row_query in show processlist.
Pull Request resolved: #953
GitHub Author: Santosh Praneeth Banda <[email protected]>

Test Plan:
 mtr

Originally Reviewed By: tianx

Reviewers: abhinavsharma, mung

Reviewed By: mung

Subscribers: butterflybot, vinaybhat, [email protected], [email protected]

Differential Revision: https://phabricator.intern.facebook.com/D14137212

Signature: 14137212:1552320969:b90f4d209c7a38d9836ff511daabf6cd786089da
  • Loading branch information
@facebook-github-bot
facebook-github-bot authored and Herman Lee committed Mar 11, 2019
1 parent b42aeba commit ba5ad2d
Show file tree
Hide file tree
Showing 10 changed files with 174 additions and 73 deletions.
2 changes: 1 addition & 1 deletion mysql-test/suite/rpl/r/rpl_invalid_mem_access_with_rows_query_log_event.result
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ INSERT INTO t1 VALUES(1);
SET DEBUG_SYNC= "now WAIT_FOR deleted_rows_query_ev";
SELECT state,info FROM information_schema.processlist WHERE state like 'debug%';;
state debug sync point: now
info NULL
info INSERT INTO test.t1 (1)
SET DEBUG_SYNC = "now SIGNAL go_ahead";
#
# Step 6) Cleanup
Expand Down
36 changes: 18 additions & 18 deletions mysql-test/suite/rpl/r/rpl_multi_source_row_stages.result
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,36 +44,36 @@ Commit;
check on channel_1
include/start_slave_sql.inc [FOR CHANNEL 'channel_1']
SET debug_sync= 'now WAIT_FOR signal.rpl_row_apply_progress_updated';
include/assert.inc [PERFORMANCE_SCHEMA.threads reports: state=Applying batch of row changes (write), db=test, info LIKE "INSERT INTO t1 VALUES (1)", Query]
include/assert.inc [INFORMATION_SCHEMA.processlist reports: db=test, info LIKE "INSERT INTO t1 VALUES (1)", command=Query]
[SHOW PROCESSLIST reports: db=test, info LIKE "INSERT INTO t1 VALUES (1)", command=Query]
include/assert.inc [PERFORMANCE_SCHEMA.threads reports: state=Applying batch of row changes (write), db=test, info LIKE "INSERT INTO test.t1 (1)", Query]
include/assert.inc [INFORMATION_SCHEMA.processlist reports: db=test, info LIKE "INSERT INTO test.t1 (1)", command=Query]
[SHOW PROCESSLIST reports: db=test, info LIKE "INSERT INTO test.t1 (1)", command=Query]
SET debug_sync= 'now SIGNAL signal.rpl_row_apply_process_next_row';
SET debug_sync= 'now WAIT_FOR signal.rpl_row_apply_progress_updated';
include/assert.inc [PERFORMANCE_SCHEMA.threads reports: state=Applying batch of row changes (update), db=test, info LIKE "UPDATE t1 SET a= 2", Query]
include/assert.inc [INFORMATION_SCHEMA.processlist reports: db=test, info LIKE "UPDATE t1 SET a= 2", command=Query]
[SHOW PROCESSLIST reports: db=test, info LIKE "UPDATE t1 SET a= 2", command=Query]
include/assert.inc [PERFORMANCE_SCHEMA.threads reports: state=Applying batch of row changes (update), db=test, info LIKE "UPDATE test.t1 (1)(2)", Query]
include/assert.inc [INFORMATION_SCHEMA.processlist reports: db=test, info LIKE "UPDATE test.t1 (1)(2)", command=Query]
[SHOW PROCESSLIST reports: db=test, info LIKE "UPDATE test.t1 (1)(2)", command=Query]
SET debug_sync= 'now SIGNAL signal.rpl_row_apply_process_next_row';
SET debug_sync= 'now WAIT_FOR signal.rpl_row_apply_progress_updated';
include/assert.inc [PERFORMANCE_SCHEMA.threads reports: state=Applying batch of row changes (delete), db=test, info LIKE "DELETE FROM t1 WHERE a=2", Query]
include/assert.inc [INFORMATION_SCHEMA.processlist reports: db=test, info LIKE "DELETE FROM t1 WHERE a=2", command=Query]
[SHOW PROCESSLIST reports: db=test, info LIKE "DELETE FROM t1 WHERE a=2", command=Query]
include/assert.inc [PERFORMANCE_SCHEMA.threads reports: state=Applying batch of row changes (delete), db=test, info LIKE "DELETE FROM test.t1 (2)", Query]
include/assert.inc [INFORMATION_SCHEMA.processlist reports: db=test, info LIKE "DELETE FROM test.t1 (2)", command=Query]
[SHOW PROCESSLIST reports: db=test, info LIKE "DELETE FROM test.t1 (2)", command=Query]
SET debug_sync= 'now SIGNAL signal.rpl_row_apply_process_next_row';
check on channel_3
include/start_slave_sql.inc [FOR CHANNEL 'channel_3']
SET debug_sync= 'now WAIT_FOR signal.rpl_row_apply_progress_updated';
include/assert.inc [PERFORMANCE_SCHEMA.threads reports: state=Applying batch of row changes (write), db=test, info LIKE "INSERT INTO t1 VALUES (1)", Query]
include/assert.inc [INFORMATION_SCHEMA.processlist reports: db=test, info LIKE "INSERT INTO t1 VALUES (1)", command=Query]
[SHOW PROCESSLIST reports: db=test, info LIKE "INSERT INTO t1 VALUES (1)", command=Query]
include/assert.inc [PERFORMANCE_SCHEMA.threads reports: state=Applying batch of row changes (write), db=test, info LIKE "INSERT INTO test.t1 (1)", Query]
include/assert.inc [INFORMATION_SCHEMA.processlist reports: db=test, info LIKE "INSERT INTO test.t1 (1)", command=Query]
[SHOW PROCESSLIST reports: db=test, info LIKE "INSERT INTO test.t1 (1)", command=Query]
SET debug_sync= 'now SIGNAL signal.rpl_row_apply_process_next_row';
SET debug_sync= 'now WAIT_FOR signal.rpl_row_apply_progress_updated';
include/assert.inc [PERFORMANCE_SCHEMA.threads reports: state=Applying batch of row changes (update), db=test, info LIKE "UPDATE t1 SET a= 2", Query]
include/assert.inc [INFORMATION_SCHEMA.processlist reports: db=test, info LIKE "UPDATE t1 SET a= 2", command=Query]
[SHOW PROCESSLIST reports: db=test, info LIKE "UPDATE t1 SET a= 2", command=Query]
include/assert.inc [PERFORMANCE_SCHEMA.threads reports: state=Applying batch of row changes (update), db=test, info LIKE "UPDATE test.t1 (1)(2)", Query]
include/assert.inc [INFORMATION_SCHEMA.processlist reports: db=test, info LIKE "UPDATE test.t1 (1)(2)", command=Query]
[SHOW PROCESSLIST reports: db=test, info LIKE "UPDATE test.t1 (1)(2)", command=Query]
SET debug_sync= 'now SIGNAL signal.rpl_row_apply_process_next_row';
SET debug_sync= 'now WAIT_FOR signal.rpl_row_apply_progress_updated';
include/assert.inc [PERFORMANCE_SCHEMA.threads reports: state=Applying batch of row changes (delete), db=test, info LIKE "DELETE FROM t1 WHERE a=2", Query]
include/assert.inc [INFORMATION_SCHEMA.processlist reports: db=test, info LIKE "DELETE FROM t1 WHERE a=2", command=Query]
[SHOW PROCESSLIST reports: db=test, info LIKE "DELETE FROM t1 WHERE a=2", command=Query]
include/assert.inc [PERFORMANCE_SCHEMA.threads reports: state=Applying batch of row changes (delete), db=test, info LIKE "DELETE FROM test.t1 (2)", Query]
include/assert.inc [INFORMATION_SCHEMA.processlist reports: db=test, info LIKE "DELETE FROM test.t1 (2)", command=Query]
[SHOW PROCESSLIST reports: db=test, info LIKE "DELETE FROM test.t1 (2)", command=Query]
SET debug_sync= 'now SIGNAL signal.rpl_row_apply_process_next_row';
# Removing debug point 'dbug.rpl_apply_sync_barrier' from @@GLOBAL.debug
[connection server_1]
Expand Down
66 changes: 33 additions & 33 deletions mysql-test/suite/rpl/r/rpl_row_stages.result
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,19 @@ COMMIT;
# Adding debug point 'dbug.rpl_apply_sync_barrier' to @@GLOBAL.debug
include/start_slave_sql.inc
SET debug_sync= 'now WAIT_FOR signal.rpl_row_apply_progress_updated';
include/assert.inc [PERFORMANCE_SCHEMA.threads reports: state=Applying batch of row changes (write), db=db_wl7364, info LIKE "INSERT INTO t1 VALUES (1)", Query]
include/assert.inc [INFORMATION_SCHEMA.processlist reports: db=db_wl7364, info LIKE "INSERT INTO t1 VALUES (1)", command=Query]
[SHOW PROCESSLIST reports: db=db_wl7364, info LIKE "INSERT INTO t1 VALUES (1)", command=Query]
include/assert.inc [PERFORMANCE_SCHEMA.threads reports: state=Applying batch of row changes (write), db=db_wl7364, info LIKE "INSERT INTO db_wl7364.t1 (1)", Query]
include/assert.inc [INFORMATION_SCHEMA.processlist reports: db=db_wl7364, info LIKE "INSERT INTO db_wl7364.t1 (1)", command=Query]
[SHOW PROCESSLIST reports: db=db_wl7364, info LIKE "INSERT INTO db_wl7364.t1 (1)", command=Query]
SET debug_sync= 'now SIGNAL signal.rpl_row_apply_process_next_row';
SET debug_sync= 'now WAIT_FOR signal.rpl_row_apply_progress_updated';
include/assert.inc [PERFORMANCE_SCHEMA.threads reports: state=Applying batch of row changes (update), db=db_wl7364, info LIKE "UPDATE t1 SET c1= 2", Query]
include/assert.inc [INFORMATION_SCHEMA.processlist reports: db=db_wl7364, info LIKE "UPDATE t1 SET c1= 2", command=Query]
[SHOW PROCESSLIST reports: db=db_wl7364, info LIKE "UPDATE t1 SET c1= 2", command=Query]
include/assert.inc [PERFORMANCE_SCHEMA.threads reports: state=Applying batch of row changes (update), db=db_wl7364, info LIKE "UPDATE db_wl7364.t1 (1)(2)", Query]
include/assert.inc [INFORMATION_SCHEMA.processlist reports: db=db_wl7364, info LIKE "UPDATE db_wl7364.t1 (1)(2)", command=Query]
[SHOW PROCESSLIST reports: db=db_wl7364, info LIKE "UPDATE db_wl7364.t1 (1)(2)", command=Query]
SET debug_sync= 'now SIGNAL signal.rpl_row_apply_process_next_row';
SET debug_sync= 'now WAIT_FOR signal.rpl_row_apply_progress_updated';
include/assert.inc [PERFORMANCE_SCHEMA.threads reports: state=Applying batch of row changes (delete), db=db_wl7364, info LIKE "DELETE FROM t1 WHERE c1=2", Query]
include/assert.inc [INFORMATION_SCHEMA.processlist reports: db=db_wl7364, info LIKE "DELETE FROM t1 WHERE c1=2", command=Query]
[SHOW PROCESSLIST reports: db=db_wl7364, info LIKE "DELETE FROM t1 WHERE c1=2", command=Query]
include/assert.inc [PERFORMANCE_SCHEMA.threads reports: state=Applying batch of row changes (delete), db=db_wl7364, info LIKE "DELETE FROM db_wl7364.t1 (2)", Query]
include/assert.inc [INFORMATION_SCHEMA.processlist reports: db=db_wl7364, info LIKE "DELETE FROM db_wl7364.t1 (2)", command=Query]
[SHOW PROCESSLIST reports: db=db_wl7364, info LIKE "DELETE FROM db_wl7364.t1 (2)", command=Query]
SET debug_sync= 'now SIGNAL signal.rpl_row_apply_process_next_row';
[connection master]
SET @@SESSION.BINLOG_ROWS_QUERY_LOG_EVENTS=0;
Expand All @@ -50,19 +50,19 @@ COMMIT;
# Adding debug point 'dbug.rpl_apply_sync_barrier' to @@GLOBAL.debug
include/start_slave_sql.inc
SET debug_sync= 'now WAIT_FOR signal.rpl_row_apply_progress_updated';
include/assert.inc [PERFORMANCE_SCHEMA.threads reports: state=Applying batch of row changes (write), db=db_wl7364, info IS NULL, Query]
include/assert.inc [INFORMATION_SCHEMA.processlist reports: db=db_wl7364, info IS NULL, command=Query]
[SHOW PROCESSLIST reports: db=db_wl7364, info LIKE 'NULL', command=Query]
include/assert.inc [PERFORMANCE_SCHEMA.threads reports: state=Applying batch of row changes (write), db=db_wl7364, info LIKE "INSERT INTO db_wl7364.t1 (1)", Query]
include/assert.inc [INFORMATION_SCHEMA.processlist reports: db=db_wl7364, info LIKE "INSERT INTO db_wl7364.t1 (1)", command=Query]
[SHOW PROCESSLIST reports: db=db_wl7364, info LIKE "INSERT INTO db_wl7364.t1 (1)", command=Query]
SET debug_sync= 'now SIGNAL signal.rpl_row_apply_process_next_row';
SET debug_sync= 'now WAIT_FOR signal.rpl_row_apply_progress_updated';
include/assert.inc [PERFORMANCE_SCHEMA.threads reports: state=Applying batch of row changes (update), db=db_wl7364, info IS NULL, Query]
include/assert.inc [INFORMATION_SCHEMA.processlist reports: db=db_wl7364, info IS NULL, command=Query]
[SHOW PROCESSLIST reports: db=db_wl7364, info LIKE 'NULL', command=Query]
include/assert.inc [PERFORMANCE_SCHEMA.threads reports: state=Applying batch of row changes (update), db=db_wl7364, info LIKE "UPDATE db_wl7364.t1 (1)(2)", Query]
include/assert.inc [INFORMATION_SCHEMA.processlist reports: db=db_wl7364, info LIKE "UPDATE db_wl7364.t1 (1)(2)", command=Query]
[SHOW PROCESSLIST reports: db=db_wl7364, info LIKE "UPDATE db_wl7364.t1 (1)(2)", command=Query]
SET debug_sync= 'now SIGNAL signal.rpl_row_apply_process_next_row';
SET debug_sync= 'now WAIT_FOR signal.rpl_row_apply_progress_updated';
include/assert.inc [PERFORMANCE_SCHEMA.threads reports: state=Applying batch of row changes (delete), db=db_wl7364, info IS NULL, Query]
include/assert.inc [INFORMATION_SCHEMA.processlist reports: db=db_wl7364, info IS NULL, command=Query]
[SHOW PROCESSLIST reports: db=db_wl7364, info LIKE 'NULL', command=Query]
include/assert.inc [PERFORMANCE_SCHEMA.threads reports: state=Applying batch of row changes (delete), db=db_wl7364, info LIKE "DELETE FROM db_wl7364.t1 (2)", Query]
include/assert.inc [INFORMATION_SCHEMA.processlist reports: db=db_wl7364, info LIKE "DELETE FROM db_wl7364.t1 (2)", command=Query]
[SHOW PROCESSLIST reports: db=db_wl7364, info LIKE "DELETE FROM db_wl7364.t1 (2)", command=Query]
SET debug_sync= 'now SIGNAL signal.rpl_row_apply_process_next_row';
# Removing debug point 'dbug.rpl_apply_sync_barrier' from @@GLOBAL.debug
[connection master]
Expand All @@ -80,22 +80,22 @@ AYzz6oU=
BINLOG 'mSKWVhMBAAAAMgAAAOYCAAAAAPAAAAAAAAEACWRiX3dsNzM2NAACdDEAAQMAAfg9wnk=mSKWVh4BAAAAKAAAAA4DAAAAAPAAAAAAAAEAAgAB//4BAAAAnirPSw==';
[connection master]
SET debug_sync= 'now WAIT_FOR signal.rpl_row_apply_progress_updated';
include/assert.inc [PERFORMANCE_SCHEMA.threads reports: state=Applying batch of row changes (write), db=db_wl7364, info LIKE "BINLOG %", Query]
include/assert.inc [INFORMATION_SCHEMA.processlist reports: db=db_wl7364, info LIKE "BINLOG %", command=Query]
include/assert.inc [PERFORMANCE_SCHEMA.threads reports: state=Applying batch of row changes (write), db=db_wl7364, info LIKE "INSERT INTO db_wl7364.t1 (1)", Query]
include/assert.inc [INFORMATION_SCHEMA.processlist reports: db=db_wl7364, info LIKE "INSERT INTO db_wl7364.t1 (1)", command=Query]
SET debug_sync= 'now SIGNAL signal.rpl_row_apply_process_next_row';
[connection master1]
BINLOG 'mSKWVhMBAAAAMgAAAGsDAAAAAPAAAAAAAAEACWRiX3dsNzM2NAACdDEAAQMAAWFoKHE=mSKWVh8BAAAALgAAAJkDAAAAAPAAAAAAAAEAAgAB///+AQAAAP4CAAAAuiHqhw==';
[connection master]
SET debug_sync= 'now WAIT_FOR signal.rpl_row_apply_progress_updated';
include/assert.inc [PERFORMANCE_SCHEMA.threads reports: state=Applying batch of row changes (update), db=db_wl7364, info LIKE "BINLOG %", Query]
include/assert.inc [INFORMATION_SCHEMA.processlist reports: db=db_wl7364, info LIKE "BINLOG %", command=Query]
include/assert.inc [PERFORMANCE_SCHEMA.threads reports: state=Applying batch of row changes (update), db=db_wl7364, info LIKE "UPDATE db_wl7364.t1 (1)(2)", Query]
include/assert.inc [INFORMATION_SCHEMA.processlist reports: db=db_wl7364, info LIKE "UPDATE db_wl7364.t1 (1)(2)", command=Query]
SET debug_sync= 'now SIGNAL signal.rpl_row_apply_process_next_row';
[connection master1]
BINLOG 'mSKWVhMBAAAAMgAAAPwDAAAAAPAAAAAAAAEACWRiX3dsNzM2NAACdDEAAQMAAd+b01A=mSKWViABAAAAKAAAACQEAAAAAPAAAAAAAAEAAgAB//4CAAAAN7fZXg== ';
[connection master]
SET debug_sync= 'now WAIT_FOR signal.rpl_row_apply_progress_updated';
include/assert.inc [PERFORMANCE_SCHEMA.threads reports: state=Applying batch of row changes (delete), db=db_wl7364, info LIKE "BINLOG %", Query]
include/assert.inc [INFORMATION_SCHEMA.processlist reports: db=db_wl7364, info LIKE "BINLOG %", command=Query]
include/assert.inc [PERFORMANCE_SCHEMA.threads reports: state=Applying batch of row changes (delete), db=db_wl7364, info LIKE "DELETE FROM db_wl7364.t1 (2)", Query]
include/assert.inc [INFORMATION_SCHEMA.processlist reports: db=db_wl7364, info LIKE "DELETE FROM db_wl7364.t1 (2)", command=Query]
SET debug_sync= 'now SIGNAL signal.rpl_row_apply_process_next_row';
[connection master1]
COMMIT;
Expand Down Expand Up @@ -220,19 +220,19 @@ COMMIT;
# Adding debug point 'dbug.rpl_apply_sync_barrier' to @@GLOBAL.debug
include/start_slave_sql.inc
SET debug_sync= 'now WAIT_FOR signal.rpl_row_apply_progress_updated';
include/assert.inc [PERFORMANCE_SCHEMA.threads reports: state=Applying batch of row changes (write), db=db2, info LIKE "INSERT INTO t1 VALUES (1)", Query]
include/assert.inc [INFORMATION_SCHEMA.processlist reports: db=db2, info LIKE "INSERT INTO t1 VALUES (1)", command=Query]
[SHOW PROCESSLIST reports: db=db2, info LIKE "INSERT INTO t1 VALUES (1)", command=Query]
include/assert.inc [PERFORMANCE_SCHEMA.threads reports: state=Applying batch of row changes (write), db=db2, info LIKE "INSERT INTO db2.t1 (1)", Query]
include/assert.inc [INFORMATION_SCHEMA.processlist reports: db=db2, info LIKE "INSERT INTO db2.t1 (1)", command=Query]
[SHOW PROCESSLIST reports: db=db2, info LIKE "INSERT INTO db2.t1 (1)", command=Query]
SET debug_sync= 'now SIGNAL signal.rpl_row_apply_process_next_row';
SET debug_sync= 'now WAIT_FOR signal.rpl_row_apply_progress_updated';
include/assert.inc [PERFORMANCE_SCHEMA.threads reports: state=Applying batch of row changes (update), db=db2, info LIKE "UPDATE t1 SET c1= 2", Query]
include/assert.inc [INFORMATION_SCHEMA.processlist reports: db=db2, info LIKE "UPDATE t1 SET c1= 2", command=Query]
[SHOW PROCESSLIST reports: db=db2, info LIKE "UPDATE t1 SET c1= 2", command=Query]
include/assert.inc [PERFORMANCE_SCHEMA.threads reports: state=Applying batch of row changes (update), db=db2, info LIKE "UPDATE db2.t1 (1)(2)", Query]
include/assert.inc [INFORMATION_SCHEMA.processlist reports: db=db2, info LIKE "UPDATE db2.t1 (1)(2)", command=Query]
[SHOW PROCESSLIST reports: db=db2, info LIKE "UPDATE db2.t1 (1)(2)", command=Query]
SET debug_sync= 'now SIGNAL signal.rpl_row_apply_process_next_row';
SET debug_sync= 'now WAIT_FOR signal.rpl_row_apply_progress_updated';
include/assert.inc [PERFORMANCE_SCHEMA.threads reports: state=Applying batch of row changes (delete), db=db2, info LIKE "DELETE FROM t1 WHERE c1=2", Query]
include/assert.inc [INFORMATION_SCHEMA.processlist reports: db=db2, info LIKE "DELETE FROM t1 WHERE c1=2", command=Query]
[SHOW PROCESSLIST reports: db=db2, info LIKE "DELETE FROM t1 WHERE c1=2", command=Query]
include/assert.inc [PERFORMANCE_SCHEMA.threads reports: state=Applying batch of row changes (delete), db=db2, info LIKE "DELETE FROM db2.t1 (2)", Query]
include/assert.inc [INFORMATION_SCHEMA.processlist reports: db=db2, info LIKE "DELETE FROM db2.t1 (2)", command=Query]
[SHOW PROCESSLIST reports: db=db2, info LIKE "DELETE FROM db2.t1 (2)", command=Query]
SET debug_sync= 'now SIGNAL signal.rpl_row_apply_process_next_row';
[connection slave]
# Removing debug point 'dbug.rpl_apply_sync_barrier' from @@GLOBAL.debug
Expand Down
6 changes: 3 additions & 3 deletions mysql-test/suite/rpl/t/rpl_multi_source_row_stages.test
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,17 +114,17 @@ while ($j)
if ($i == 3)
{
--let $state_progress= Applying batch of row changes (write)
--let $info= INSERT INTO t1 VALUES (1)
--let $info= INSERT INTO test.t1 (1)
}
if ($i == 2)
{
--let $state_progress= Applying batch of row changes (update)
--let $info= UPDATE t1 SET a= 2
--let $info= UPDATE test.t1 (1)(2)
}
if ($i == 1)
{
--let $state_progress= Applying batch of row changes (delete)
--let $info= DELETE FROM t1 WHERE a=2
--let $info= DELETE FROM test.t1 (2)
}

# this session waits for the progress to be updated
Expand Down
Loading

0 comments on commit ba5ad2d

Please sign in to comment.