Skip to content
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

Jump to bottom

binlog: update binlog status from Skippping to On when recover binlog #32173

Merged
merged 9 commits into from
Nov 14, 2022
Merged

binlog: update binlog status from Skippping to On when recover binlog #32173

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d19b8cc
update binlog status when disable skip binlog
joccau Feb 8, 2022
86c8b7f
check returned errno
joccau Feb 9, 2022
a59a0a0
Merge branch 'master' into fix-binlog-status
joccau Feb 9, 2022
147d1e4
Merge branch 'master' into fix-binlog-status
joccau Feb 16, 2022
52782cd
Merge branch 'master' into fix-binlog-status
joccau Feb 17, 2022
48a2dc7
Merge branch 'master' into fix-binlog-status
lichunzhu Feb 17, 2022
2433e6f
Merge branch 'master' into fix-binlog-status
hawkingrei Jun 22, 2022
3834e29
Merge branch 'master' into fix-binlog-status
ti-chi-bot Nov 14, 2022
1fc278b
Merge branch 'master' into fix-binlog-status
ti-chi-bot Nov 14, 2022
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
12 changes: 10 additions & 2 deletions server/http_handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -773,14 +773,22 @@ func (h binlogRecover) ServeHTTP(w http.ResponseWriter, req *http.Request) {
case "reset":
binloginfo.ResetSkippedCommitterCounter()
case "nowait":
binloginfo.DisableSkipBinlogFlag()
err := binloginfo.DisableSkipBinlogFlag()
if err != nil {
writeError(w, err)
return
}
case "status":
default:
sec, err := strconv.ParseInt(req.FormValue(qSeconds), 10, 64)
if sec <= 0 || err != nil {
sec = 1800
}
binloginfo.DisableSkipBinlogFlag()
err = binloginfo.DisableSkipBinlogFlag()
if err != nil {
writeError(w, err)
return
}
timeout := time.Duration(sec) * time.Second
err = binloginfo.WaitBinlogRecover(timeout)
if err != nil {
Expand Down
8 changes: 7 additions & 1 deletion sessionctx/binloginfo/binloginfo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,15 @@ func EnableSkipBinlogFlag() {
}

// DisableSkipBinlogFlag disable the skipBinlog flag.
func DisableSkipBinlogFlag() {
func DisableSkipBinlogFlag() error {
if err := statusListener(BinlogStatusOn); err != nil {
logutil.BgLogger().Warn("update binlog status failed", zap.Error(err))
return errors.Trace(err)
}

atomic.StoreUint32(&skipBinlog, 0)
logutil.BgLogger().Warn("[binloginfo] disable the skipBinlog flag")
return nil
}

// IsBinlogSkipped gets the skipBinlog flag.
Expand Down