Skip to content

Updates how master gtid position is obtained for file:pos flavor #5689

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sougou merged 1 commit into from
Jan 11, 2020
Merged

Updates how master gtid position is obtained for file:pos flavor #5689

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 5 additions & 24 deletions go/mysql/flavor_filepos.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,44 +40,25 @@ func newFilePosFlavor() flavor {

// masterGTIDSet is part of the Flavor interface.
func (flv *filePosFlavor) masterGTIDSet(c *Conn) (GTIDSet, error) {
qr, err := c.ExecuteFetch("SHOW SLAVE STATUS", 100, true /* wantfields */)
qr, err := c.ExecuteFetch("SHOW MASTER STATUS", 100, true /* wantfields */)
if err != nil {
return nil, err
}
if len(qr.Rows) == 0 {
qr, err = c.ExecuteFetch("SHOW MASTER STATUS", 100, true /* wantfields */)
if err != nil {
return nil, err
}
if len(qr.Rows) == 0 {
return nil, errors.New("no master or slave status")
}
resultMap, err := resultToMap(qr)
if err != nil {
return nil, err
}
pos, err := strconv.Atoi(resultMap["Position"])
if err != nil {
return nil, fmt.Errorf("invalid FilePos GTID (%v): expecting pos to be an integer", resultMap["Position"])
}

return filePosGTID{
file: resultMap["File"],
pos: pos,
}, nil
return nil, errors.New("no master status")
}

resultMap, err := resultToMap(qr)
if err != nil {
return nil, err
}
pos, err := strconv.Atoi(resultMap["Exec_Master_Log_Pos"])
pos, err := strconv.Atoi(resultMap["Position"])
if err != nil {
return nil, fmt.Errorf("invalid FilePos GTID (%v): expecting pos to be an integer", resultMap["Exec_Master_Log_Pos"])
return nil, fmt.Errorf("invalid FilePos GTID (%v): expecting pos to be an integer", resultMap["Position"])
}

return filePosGTID{
file: resultMap["Relay_Master_Log_File"],
file: resultMap["File"],
pos: pos,
}, nil
}
Expand Down