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

executor: handle OOM panic which not be recovered now in distSQL layer #10545

Merged
merged 2 commits into from
May 20, 2019
Merged

executor: handle OOM panic which not be recovered now in distSQL layer #10545

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
baf76b6
executor: handle OOM panic which not be recovered now in distSQL layer
qw4990 May 20, 2019
0deed22
fix import
qw4990 May 20, 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
9 changes: 9 additions & 0 deletions distsql/select_result.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
package distsql

import (
"fmt"
"time"

"github.com/pingcap/errors"
Expand All @@ -25,8 +26,10 @@ import (
"github.com/pingcap/tidb/types"
"github.com/pingcap/tidb/util/chunk"
"github.com/pingcap/tidb/util/codec"
"github.com/pingcap/tidb/util/logutil"
"github.com/pingcap/tidb/util/memory"
"github.com/pingcap/tipb/go-tipb"
"go.uber.org/zap"
"golang.org/x/net/context"
)

Expand Down Expand Up @@ -80,6 +83,12 @@ func (r *selectResult) Fetch(ctx context.Context) {
func (r *selectResult) fetch(ctx context.Context) {
startTime := time.Now()
defer func() {
if c := recover(); c != nil {
err := fmt.Errorf("%v", c)
logutil.Logger(ctx).Error("OOM", zap.Error(err))
r.results <- resultWithErr{err: err}
}

close(r.results)
duration := time.Since(startTime)
metrics.DistSQLQueryHistgram.WithLabelValues(r.label, r.sqlType).Observe(duration.Seconds())
Expand Down
20 changes: 16 additions & 4 deletions store/tikv/coprocessor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -545,8 +545,8 @@ func (sender *copIteratorTaskSender) sendToTaskCh(t *copTask) (exit bool) {
return
}

func (worker *copIteratorWorker) sendToRespCh(resp *copResponse, respCh chan<- *copResponse) (exit bool) {
if worker.memTracker != nil {
func (worker *copIteratorWorker) sendToRespCh(resp *copResponse, respCh chan<- *copResponse, checkOOM bool) (exit bool) {
if worker.memTracker != nil && checkOOM {
worker.memTracker.Consume(int64(resp.MemSize()))
}
select {
Expand Down Expand Up @@ -607,12 +607,24 @@ func (it *copIterator) Next(ctx context.Context) (kv.ResultSubset, error) {

// handleTask handles single copTask, sends the result to channel, retry automatically on error.
func (worker *copIteratorWorker) handleTask(bo *Backoffer, task *copTask, respCh chan<- *copResponse) {
defer func() {
r := recover()
if r != nil {
logutil.Logger(context.Background()).Error("copIteratorWork meet panic",
zap.Reflect("r", r),
zap.Stack("stack trace"))
resp := &copResponse{err: errors.Errorf("%v", r)}
// if panic has happened, set checkOOM to false to avoid another panic.
worker.sendToRespCh(resp, task.respChan, false)
}
}()

remainTasks := []*copTask{task}
for len(remainTasks) > 0 {
tasks, err := worker.handleTaskOnce(bo, remainTasks[0], respCh)
if err != nil {
resp := &copResponse{err: errors.Trace(err)}
worker.sendToRespCh(resp, respCh)
worker.sendToRespCh(resp, respCh, true)
return
}
if len(tasks) > 0 {
Expand Down Expand Up @@ -803,7 +815,7 @@ func (worker *copIteratorWorker) handleCopResponse(bo *Backoffer, resp *copRespo
}
}
}
worker.sendToRespCh(resp, ch)
worker.sendToRespCh(resp, ch, true)
return nil, nil
}

Expand Down