Skip to content

planner: handle panic when loading bindings at startup (#58017) #59062

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
merged 3 commits into from
Feb 8, 2025
Merged

planner: handle panic when loading bindings at startup (#58017) #59062

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8a98b55
This is an automated cherry-pick of #58017
qw4990 Dec 5, 2024
6a37e3e
fixup
qw4990 Feb 5, 2025
f67411d
fixup
qw4990 Feb 8, 2025
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
9 changes: 8 additions & 1 deletion bindinfo/bind_record.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import (
"time"
"unsafe"

"github.com/pingcap/errors"
"github.com/pingcap/tidb/metrics"
"github.com/pingcap/tidb/parser"
"github.com/pingcap/tidb/sessionctx"
Expand Down Expand Up @@ -161,7 +162,13 @@ func (br *BindRecord) FindBinding(hint string) *Binding {

// prepareHints builds ID and Hint for BindRecord. If sctx is not nil, we check if
// the BindSQL is still valid.
func (br *BindRecord) prepareHints(sctx sessionctx.Context) error {
func (br *BindRecord) prepareHints(sctx sessionctx.Context) (rerr error) {
defer func() {
if r := recover(); r != nil {
rerr = errors.Errorf("panic when preparing hints for binding panic: %v", r)
}
}()

p := parser.New()
for i, bind := range br.Bindings {
if (bind.Hint != nil && bind.ID != "") || bind.Status == deleted {
Expand Down