relay: fix GTID recover after relay log recovered #335

csuzhangxc · 2019-10-25T04:08:43Z

What problem does this PR solve?

MySQL may not save all previous GTID sets in its binlog file as Previous_gtids event in some special scenarios (not confirmed yet, but maybe a bug, ref https://bugs.mysql.com/bug.php?id=93809).

example:

the real previous GTID sets: 00c04543-f584-11e9-a765-0242ac120002:1-60
GTID sets in Previous_gtids event: 00c04543-f584-11e9-a765-0242ac120002:45-60
then the recovered GTID sets will become 00c04543-f584-11e9-a765-0242ac120002:45-60, but this should still be 00c04543-f584-11e9-a765-0242ac120002:1-60.
use 00c04543-f584-11e9-a765-0242ac120002:45-60 to request the master is wrong, because this will cause the master to send binlog events in 00c04543-f584-11e9-a765-0242ac120002:1-44. if this events are purged, an error (ERROR 1236 (HY000): The slave is connecting using CHANGE MASTER TO MASTER_AUTO_POSITION = 1, but the master has purged binary logs containing GTIDs that the slave requires.) will reported; if this events are not purged, they will be sent again.

What is changed and how it works?

only truncate the Stop of the GTID set intervals, like truncating 00c04543-f584-11e9-a765-0242ac120002:1-60 with 00c04543-f584-11e9-a765-0242ac120002:40-50 will get 00c04543-f584-11e9-a765-0242ac120002:1-50.

Check List

Tests

Unit test

Related changes

Need to cherry-pick to the release branch
Need to be included in the release note

csuzhangxc · 2019-10-25T05:17:44Z

/run-all-tests

csuzhangxc · 2019-10-25T06:33:25Z

/run-all-tests

codecov · 2019-10-25T07:35:51Z

Codecov Report

Merging #335 into master will not change coverage.
The diff coverage is n/a.

@@            Coverage Diff            @@
##            master      #335   +/-   ##
=========================================
  Coverage   60.147%   60.147%           
=========================================
  Files          135       135           
  Lines        15236     15236           
=========================================
  Hits          9164      9164           
  Misses        5173      5173           
  Partials       899       899

csuzhangxc · 2019-10-25T07:37:47Z

@amyangfei @WangXiangUSTC PTAL

WangXiangUSTC

rest LGTM

pkg/gtid/gtid.go

WangXiangUSTC · 2019-10-28T06:59:46Z

pkg/gtid/gtid_test.go

+		},
+		{
+			before: "00c04543-f584-11e9-a765-0242ac120002:40-60:70:80-100",
+			end:    "00c04543-f584-11e9-a765-0242ac120002:45-55:70:85-95",


how about also add a case before's interval's num is different with end, for example:
before: "00c04543-f584-11e9-a765-0242ac120002:40-60:70:80-100",
end: "00c04543-f584-11e9-a765-0242ac120002:45-55:85-95"

👍 added in feeed29.

how about also add for mariadb

WangXiangUSTC

LGTM

pkg/gtid/gtid.go

relay/relay.go

csuzhangxc · 2019-10-28T10:08:55Z

/run-all-tests

amyangfei

LGTM

sre-bot · 2019-10-28T11:13:31Z

cherry pick to release-1.0 in PR #339

lance6716 · 2022-04-22T06:49:26Z

The problem in PR description is caused by MySQL slave forget to set log_slave_updates=ON. The GTIDs when log_slave_updates is OFF will not be saved in Previous_gtids events.

MySQL [(none)]> select @@global.gtid_purged;
+------------------------------------------+
| @@global.gtid_purged                     |
+------------------------------------------+
| 250e86b4-ba95-11ea-9e12-b15aac539905:1-3 |
+------------------------------------------+
1 row in set (0.000 sec)

MySQL [(none)]> select @@global.gtid_executed;
+------------------------------------------+
| @@global.gtid_executed                   |
+------------------------------------------+
| 250e86b4-ba95-11ea-9e12-b15aac539905:1-4 |
+------------------------------------------+

MySQL [(none)]> show binlog events in 'binlog.000003';
+---------------+-----+----------------+-----------+-------------+-------------------------------------------------------------------+
| Log_name      | Pos | Event_type     | Server_id | End_log_pos | Info                                                              |
+---------------+-----+----------------+-----------+-------------+-------------------------------------------------------------------+
| binlog.000003 |   4 | Format_desc    |         1 |         123 | Server ver: 5.7.23-log, Binlog ver: 4                             |
| binlog.000003 | 123 | Previous_gtids |         1 |         154 |                                                                   |
| binlog.000003 | 154 | Gtid           |         2 |         219 | SET @@SESSION.GTID_NEXT= '250e86b4-ba95-11ea-9e12-b15aac539905:4' |
| binlog.000003 | 219 | Query          |         2 |         282 | BEGIN                                                             |
| binlog.000003 | 282 | Table_map      |         2 |         327 | table_id: 108 (gset.t1)                                           |
| binlog.000003 | 327 | Write_rows     |         2 |         367 | table_id: 108 flags: STMT_END_F                                   |
| binlog.000003 | 367 | Xid            |         2 |         398 | COMMIT /* xid=6 */                                                |
+---------------+-----+----------------+-----------+-------------+-------------------------------------------------------------------+
7 rows in set (0.001 sec)

since now we introduced #1430 , the Truncate interface is no longer needed.

csuzhangxc added 4 commits October 24, 2019 18:34

event: update wording in dummy event

19c417d

*: add truncate function for MySQL GTID sets

06ca92f

*: add truncate function for MariaDB GTID sets

ccf5f3a

relay: truncate the GTID sets after recovered the relay log file

0c66802

relay: fix CI

ca95223

csuzhangxc requested review from amyangfei and WangXiangUSTC October 25, 2019 07:38

WangXiangUSTC reviewed Oct 28, 2019

View reviewed changes

csuzhangxc added 2 commits October 28, 2019 15:19

gtid: address comment

feeed29

Merge branch 'master' into fix-recover-gtid

727a9c8

WangXiangUSTC reviewed Oct 28, 2019

View reviewed changes

WangXiangUSTC added status/LGT1 One reviewer already commented LGTM and removed status/PTAL This PR is ready for review. Add this label back after committing new changes labels Oct 28, 2019

amyangfei reviewed Oct 28, 2019

View reviewed changes

pkg/gtid/gtid.go Show resolved Hide resolved

amyangfei reviewed Oct 28, 2019

View reviewed changes

relay/relay.go Outdated Show resolved Hide resolved

relay/relay.go Outdated Show resolved Hide resolved

relay: address comments

9611a0c

Merge branch 'master' into fix-recover-gtid

3213a3f

amyangfei approved these changes Oct 28, 2019

View reviewed changes

amyangfei removed the status/LGT1 One reviewer already commented LGTM label Oct 28, 2019

amyangfei added the status/LGT2 Two reviewers already commented LGTM, ready for merge label Oct 28, 2019

csuzhangxc merged commit c6344f3 into pingcap:master Oct 28, 2019

csuzhangxc deleted the fix-recover-gtid branch October 28, 2019 11:13

sre-bot mentioned this pull request Oct 28, 2019

relay: fix GTID recover after relay log recovered (#335) #339

Merged

sre-bot added already-cherry-pick-1.0 The related PR is already cherry-picked to release-1.0. Add this label once the PR is cherry-picked and removed needs-cherry-pick-release-1.0 This PR should be cherry-picked to release-1.0. Remove this label after cherry-picked to release-1.0 labels Oct 28, 2019

csuzhangxc pushed a commit that referenced this pull request Oct 28, 2019

relay: fix GTID recover after relay log recovered (#335) (#339)

52c2d99

csuzhangxc added already-update-release-note The release note is updated. Add this label once the release note is updated and removed needs-update-release-note This PR should be added into release notes. Remove this label once the release notes are updated labels Nov 1, 2019

lichunzhu pushed a commit to lichunzhu/dm that referenced this pull request Apr 6, 2020

relay: fix GTID recover after relay log recovered (pingcap#335)

fec88bc

lance6716 mentioned this pull request Apr 22, 2022

pkg/gtid: remove gtid.Set interface pingcap/tiflow#5246

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

relay: fix GTID recover after relay log recovered #335

relay: fix GTID recover after relay log recovered #335

csuzhangxc commented Oct 25, 2019

csuzhangxc commented Oct 25, 2019

csuzhangxc commented Oct 25, 2019

codecov bot commented Oct 25, 2019 •

edited

Loading

csuzhangxc commented Oct 25, 2019

WangXiangUSTC left a comment

WangXiangUSTC Oct 28, 2019

csuzhangxc Oct 28, 2019

WangXiangUSTC Oct 28, 2019

WangXiangUSTC left a comment

csuzhangxc commented Oct 28, 2019

amyangfei left a comment

sre-bot commented Oct 28, 2019

lance6716 commented Apr 22, 2022

relay: fix GTID recover after relay log recovered #335

relay: fix GTID recover after relay log recovered #335

Conversation

csuzhangxc commented Oct 25, 2019

What problem does this PR solve?

What is changed and how it works?

Check List

csuzhangxc commented Oct 25, 2019

csuzhangxc commented Oct 25, 2019

codecov bot commented Oct 25, 2019 • edited Loading

Codecov Report

csuzhangxc commented Oct 25, 2019

WangXiangUSTC left a comment

Choose a reason for hiding this comment

WangXiangUSTC Oct 28, 2019

Choose a reason for hiding this comment

csuzhangxc Oct 28, 2019

Choose a reason for hiding this comment

WangXiangUSTC Oct 28, 2019

Choose a reason for hiding this comment

WangXiangUSTC left a comment

Choose a reason for hiding this comment

csuzhangxc commented Oct 28, 2019

amyangfei left a comment

Choose a reason for hiding this comment

sre-bot commented Oct 28, 2019

lance6716 commented Apr 22, 2022

codecov bot commented Oct 25, 2019 •

edited

Loading