From 1cae2c57f3ad066eef4705109e705e141b43b2fe Mon Sep 17 00:00:00 2001 From: ti-srebot <66930949+ti-srebot@users.noreply.github.com> Date: Thu, 16 Sep 2021 13:52:43 +0800 Subject: [PATCH] planner: fix goroutine leak problem in some unit tests (#26500) (#26506) --- planner/core/prepare_test.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/planner/core/prepare_test.go b/planner/core/prepare_test.go index 1a8d8a496d38b..f243d54907905 100644 --- a/planner/core/prepare_test.go +++ b/planner/core/prepare_test.go @@ -1022,11 +1022,12 @@ func (s *testPrepareSerialSuite) TestPrepareCacheWithJoinTable(c *C) { } func (s *testPlanSerialSuite) TestPlanCacheSnapshot(c *C) { - store, _, err := newStoreWithBootstrap() + store, dom, err := newStoreWithBootstrap() c.Assert(err, IsNil) tk := testkit.NewTestKit(c, store) orgEnable := core.PreparedPlanCacheEnabled() defer func() { + dom.Close() err = store.Close() c.Assert(err, IsNil) core.SetPreparedPlanCache(orgEnable) @@ -1073,11 +1074,12 @@ func (s *testPlanSerialSuite) TestPlanCacheSnapshot(c *C) { } func (s *testPlanSerialSuite) TestPlanCachePointGetAndTableDual(c *C) { - store, _, err := newStoreWithBootstrap() + store, dom, err := newStoreWithBootstrap() c.Assert(err, IsNil) tk := testkit.NewTestKit(c, store) orgEnable := core.PreparedPlanCacheEnabled() defer func() { + dom.Close() store.Close() core.SetPreparedPlanCache(orgEnable) }() @@ -1166,11 +1168,12 @@ func (s *testPlanSerialSuite) TestPlanCachePointGetAndTableDual(c *C) { } func (s *testPlanSerialSuite) TestIssue23671(c *C) { - store, _, err := newStoreWithBootstrap() + store, dom, err := newStoreWithBootstrap() c.Assert(err, IsNil) tk := testkit.NewTestKit(c, store) orgEnable := core.PreparedPlanCacheEnabled() defer func() { + dom.Close() store.Close() core.SetPreparedPlanCache(orgEnable) }()