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

conn: fix lost connection when insert from select panic cause by out of memory quota #12090

Merged
merged 8 commits into from
Sep 10, 2019
Merged

conn: fix lost connection when insert from select panic cause by out of memory quota #12090

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
38ada37
conn: fix lost connection when insert from select panic cause by out …
crazycs520 Sep 9, 2019
b85f723
add test
crazycs520 Sep 9, 2019
a2ed5a0
Merge branch 'master' into mem-quota-insert-select
crazycs520 Sep 9, 2019
9220fdc
address comment
crazycs520 Sep 9, 2019
78a83ba
Merge branch 'master' into mem-quota-insert-select
crazycs520 Sep 9, 2019
cc6b11a
address comment
crazycs520 Sep 10, 2019
2a819b1
Merge branch 'master' into mem-quota-insert-select
crazycs520 Sep 10, 2019
4aadb64
Merge branch 'master' into mem-quota-insert-select
crazycs520 Sep 10, 2019
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
10 changes: 10 additions & 0 deletions executor/executor_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4373,6 +4373,16 @@ func (s *testSuite) TestOOMPanicAction(c *C) {
err := tk.QueryToErr("select sum(b) from t group by a;")
c.Assert(err, NotNil)
c.Assert(err.Error(), Matches, "Out Of Memory Quota!.*")

// Test insert from select oom panic.
tk.MustExec("drop table if exists t,t1")
tk.MustExec("create table t (a bigint);")
tk.MustExec("create table t1 (a bigint);")
tk.MustExec("insert into t1 values (1),(2),(3),(4),(5);")
tk.MustExec("set @@tidb_mem_quota_query=200;")
_, err = tk.Exec("insert into t select a from t1 order by a desc;")
c.Assert(err, NotNil)
c.Assert(err.Error(), Matches, "Out Of Memory Quota!.*")
}

type oomCapturer struct {
Expand Down
13 changes: 13 additions & 0 deletions session/session.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ import (
"github.com/pingcap/tidb/util/execdetails"
"github.com/pingcap/tidb/util/kvcache"
"github.com/pingcap/tidb/util/logutil"
"github.com/pingcap/tidb/util/memory"
"github.com/pingcap/tidb/util/sqlexec"
"github.com/pingcap/tidb/util/timeutil"
"github.com/pingcap/tipb/go-binlog"
Expand Down Expand Up @@ -1036,6 +1037,18 @@ func (s *session) executeStatement(ctx context.Context, connID uint64, stmtNode
}

func (s *session) Execute(ctx context.Context, sql string) (recordSets []sqlexec.RecordSet, err error) {
defer func() {
r := recover()
if r == nil {
return
}
if str, ok := r.(string); !ok || !strings.HasPrefix(str, memory.PanicMemoryExceed) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think a better place is ExecStmt.Exec() function, or ExecStmt.handleNoDelay() and ExecStmt.handlePessimisticSelectForUpdate() function.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done.

panic(r)
}
err = errors.Errorf("%v", r)
logutil.Logger(ctx).Error("execute sql panic", zap.String("sql", sql), zap.Stack("stack"))
}()

if span := opentracing.SpanFromContext(ctx); span != nil && span.Tracer() != nil {
span1 := span.Tracer().StartSpan("session.Execute", opentracing.ChildOf(span.Context()))
defer span1.Finish()
Expand Down