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

copr: fix copr cache panic when tidb_enable_collect_execution_info is off (#48340) #48476

Merged
merged 2 commits into from
Jan 12, 2024
Merged

copr: fix copr cache panic when tidb_enable_collect_execution_info is off (#48340) #48476

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
bf802df
This is an automated cherry-pick of #48340
you06 Nov 9, 2023
ed00191
resolve conflict
you06 Nov 13, 2023
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
22 changes: 22 additions & 0 deletions pkg/executor/distsql_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -698,3 +698,25 @@ func TestIndexLookUpWithSelectForUpdateOnPartitionTable(t *testing.T) {
tk.MustHavePlan("select b from t use index(k) where b > 2 order by b limit 1 for update", "IndexLookUp")
tk.MustQuery("select b from t use index(k) where b > 2 order by b limit 1 for update").Check(testkit.Rows("3"))
}

func TestCoprCacheWithoutExecutionInfo(t *testing.T) {
store := testkit.CreateMockStore(t)
tk := testkit.NewTestKit(t, store)
tk1 := testkit.NewTestKit(t, store)
tk.MustExec("use test")
tk.MustExec("drop table if exists t")
tk.MustExec("create table t(id int)")
tk.MustExec("insert into t values(1), (2), (3)")

require.NoError(t, failpoint.Enable("github.com/pingcap/tidb/pkg/store/mockstore/unistore/cophandler/mockCopCacheInUnistore", `return(123)`))
defer func() {
require.NoError(t, failpoint.Disable("github.com/pingcap/tidb/pkg/store/mockstore/unistore/cophandler/mockCopCacheInUnistore"))
}()

defer tk.MustExec("set @@tidb_enable_collect_execution_info=1")
ctx := context.WithValue(context.Background(), "CheckSelectRequestHook", func(_ *kv.Request) {
tk1.MustExec("set @@tidb_enable_collect_execution_info=0")
})
tk.MustQuery("select * from t").Check(testkit.Rows("1", "2", "3"))
tk.MustQueryWithContext(ctx, "select * from t").Check(testkit.Rows("1", "2", "3"))
}
9 changes: 8 additions & 1 deletion pkg/store/copr/coprocessor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1685,7 +1685,14 @@ func (worker *copIteratorWorker) handleCopCache(task *copTask, resp *copResponse
resp.pbResp.Range = nil
}
}
resp.detail.CoprCacheHit = true
// `worker.enableCollectExecutionInfo` is loaded from the instance's config. Because it's not related to the request,
// the cache key can be same when `worker.enableCollectExecutionInfo` is true or false.
// When `worker.enableCollectExecutionInfo` is false, the `resp.detail` is nil, and hit cache is still possible.
// Check `resp.detail` to avoid panic.
// Details: https://github.com/pingcap/tidb/issues/48212
if resp.detail != nil {
resp.detail.CoprCacheHit = true
}
return nil
}
copr_metrics.CoprCacheCounterMiss.Add(1)
Expand Down