*: fix oom action cancel bug (#10993) (#11016)

pingcap · Jul 2, 2019 · 6d90e81 · 6d90e81
1 parent 2a0d4ce
commit 6d90e81
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/executor/executor_test.go b/executor/executor_test.go
@@ -3681,6 +3681,18 @@ func (s *testOOMSuite) TestDistSQLMemoryControl(c *C) {
 	tk.Se.GetSessionVars().MemQuotaDistSQL = -1
 }
 
+func (s *testSuite) TestOOMPanicAction(c *C) {
+	tk := testkit.NewTestKit(c, s.store)
+	tk.MustExec("use test")
+	tk.MustExec("drop table if exists t")
+	tk.MustExec("create table t (a int primary key, b double);")
+	tk.MustExec("insert into t values (1,1)")
+	config.GetGlobalConfig().OOMAction = config.OOMActionCancel
+	tk.MustExec("set @@tidb_mem_quota_query=1;")
+	err := tk.QueryToErr("select sum(b) from t group by a;")
+	c.Assert(err, NotNil)
+}
+
 type oomCapturer struct {
 	zapcore.Core
 	tracker string

diff --git a/store/tikv/coprocessor.go b/store/tikv/coprocessor.go
@@ -617,7 +617,7 @@ func (worker *copIteratorWorker) handleTask(bo *Backoffer, task *copTask, respCh
 				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)
+			worker.sendToRespCh(resp, respCh, false)
 		}
 	}()