This is an automated cherry-pick of #61868

Signed-off-by: ti-chi-bot <[email protected]>

Author: xzhangxian1008

executor/hash_table.go

@@ -23,6 +23,7 @@ import (
 	"unsafe"
 
 	"github.com/pingcap/errors"
+<<<<<<< HEAD:executor/hash_table.go
 	"github.com/pingcap/tidb/sessionctx"
 	"github.com/pingcap/tidb/sessionctx/stmtctx"
 	"github.com/pingcap/tidb/types"
@@ -33,6 +34,18 @@ import (
 	"github.com/pingcap/tidb/util/execdetails"
 	"github.com/pingcap/tidb/util/hack"
 	"github.com/pingcap/tidb/util/memory"
+=======
+	"github.com/pingcap/failpoint"
+	"github.com/pingcap/tidb/pkg/sessionctx"
+	"github.com/pingcap/tidb/pkg/sessionctx/stmtctx"
+	"github.com/pingcap/tidb/pkg/types"
+	"github.com/pingcap/tidb/pkg/util/bitmap"
+	"github.com/pingcap/tidb/pkg/util/chunk"
+	"github.com/pingcap/tidb/pkg/util/codec"
+	"github.com/pingcap/tidb/pkg/util/disk"
+	"github.com/pingcap/tidb/pkg/util/hack"
+	"github.com/pingcap/tidb/pkg/util/memory"
+>>>>>>> af367b8a5ae (executor: replace `Call` with `CallWithRecover` in the close of hash join v1 (#61868)):pkg/executor/join/hash_table_v1.go
 )
 
 // hashContext keeps the needed hash context of a db table in hash join.
@@ -501,6 +514,8 @@ func (c *hashRowContainer) Len() uint64 {
 }
 
 func (c *hashRowContainer) Close() error {
+	failpoint.Inject("issue60923", nil)
+
 	defer c.memTracker.Detach()
 	c.chkBuf = nil
 	return c.rowContainer.Close()

executor/join.go

@@ -41,6 +41,9 @@ import (
 	"github.com/pingcap/tidb/util/memory"
 )
 
+// IsChildCloseCalledForTest is used for test
+var IsChildCloseCalledForTest = false
+
 var (
 	_ Executor = &HashJoinExec{}
 	_ Executor = &NestedLoopApplyExec{}
@@ -147,7 +150,11 @@ type hashjoinWorkerResult struct {
 }
 
 // Close implements the Executor Close interface.
+<<<<<<< HEAD:executor/join.go
 func (e *HashJoinExec) Close() error {
+=======
+func (e *HashJoinV1Exec) Close() (err error) {
+>>>>>>> af367b8a5ae (executor: replace `Call` with `CallWithRecover` in the close of hash join v1 (#61868)):pkg/executor/join/hash_join_v1.go
 	if e.closeCh != nil {
 		close(e.closeCh)
 	}
@@ -170,9 +177,19 @@ func (e *HashJoinExec) Close() error {
 			close(e.probeWorkers[i].joinChkResourceCh)
 			channel.Clear(e.probeWorkers[i].joinChkResourceCh)
 		}
+<<<<<<< HEAD:executor/join.go
 		e.probeSideTupleFetcher.probeChkResourceCh = nil
 		terror.Call(e.rowContainer.Close)
 		e.hashJoinCtx.sessCtx.GetSessionVars().MemTracker.UnbindActionFromHardLimit(e.rowContainer.ActionSpill())
+=======
+		e.ProbeSideTupleFetcher.probeChkResourceCh = nil
+		util.WithRecovery(func() { err = e.RowContainer.Close() }, func(r any) {
+			if r != nil {
+				err = errors.Errorf("%v", r)
+			}
+		})
+		e.HashJoinCtxV1.SessCtx.GetSessionVars().MemTracker.UnbindActionFromHardLimit(e.RowContainer.ActionSpill())
+>>>>>>> af367b8a5ae (executor: replace `Call` with `CallWithRecover` in the close of hash join v1 (#61868)):pkg/executor/join/hash_join_v1.go
 		e.waiterWg.Wait()
 	}
 	e.outerMatchedStatus = e.outerMatchedStatus[:0]
@@ -192,7 +209,16 @@ func (e *HashJoinExec) Close() error {
 	if e.stats != nil {
 		defer e.ctx.GetSessionVars().StmtCtx.RuntimeStatsColl.RegisterStats(e.id, e.stats)
 	}
+<<<<<<< HEAD:executor/join.go
 	err := e.baseExecutor.Close()
+=======
+
+	IsChildCloseCalledForTest = true
+	childErr := e.BaseExecutor.Close()
+	if childErr != nil {
+		return childErr
+	}
+>>>>>>> af367b8a5ae (executor: replace `Call` with `CallWithRecover` in the close of hash join v1 (#61868)):pkg/executor/join/hash_join_v1.go
 	return err
 }
 

pkg/executor/test/issuetest/BUILD.bazel

@@ -0,0 +1,33 @@
+load("@io_bazel_rules_go//go:def.bzl", "go_test")
+
+go_test(
+    name = "issuetest_test",
+    timeout = "short",
+    srcs = [
+        "executor_issue_test.go",
+        "main_test.go",
+    ],
+    flaky = True,
+    shard_count = 25,
+    deps = [
+        "//pkg/autoid_service",
+        "//pkg/config",
+        "//pkg/executor",
+        "//pkg/executor/join",
+        "//pkg/kv",
+        "//pkg/meta/autoid",
+        "//pkg/parser/auth",
+        "//pkg/parser/charset",
+        "//pkg/parser/mysql",
+        "//pkg/session/types",
+        "//pkg/testkit",
+        "//pkg/testkit/testfailpoint",
+        "//pkg/util",
+        "//pkg/util/dbterror/exeerrors",
+        "//pkg/util/memory",
+        "@com_github_pingcap_failpoint//:failpoint",
+        "@com_github_stretchr_testify//require",
+        "@com_github_tikv_client_go_v2//tikv",
+        "@org_uber_go_goleak//:goleak",
+    ],
+)