This is an automated cherry-pick of pingcap#53317

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

Author: crazycs520

DEPS.bzl

@@ -7067,13 +7067,23 @@ def go_deps():
         name = "com_github_tikv_client_go_v2",
         build_file_proto_mode = "disable_global",
         importpath = "github.com/tikv/client-go/v2",
+<<<<<<< HEAD
         sha256 = "d59b35844499db795ef90ba5676ddf7a0ca4bfa384c45ae7ef85bb13a81f568b",
         strip_prefix = "github.com/tikv/client-go/[email protected]",
         urls = [
             "http://bazel-cache.pingcap.net:8080/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20240514061427-42cf70295f31.zip",
             "http://ats.apps.svc/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20240514061427-42cf70295f31.zip",
             "https://cache.hawkingrei.com/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20240514061427-42cf70295f31.zip",
             "https://storage.googleapis.com/pingcapmirror/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20240514061427-42cf70295f31.zip",
+=======
+        sha256 = "cd975d99edd4951316942583470b3eedcb6e57484ada058cbe11d348d208d49b",
+        strip_prefix = "github.com/tikv/client-go/[email protected]",
+        urls = [
+            "http://bazel-cache.pingcap.net:8080/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20240516031922-38e0dca30c8c.zip",
+            "http://ats.apps.svc/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20240516031922-38e0dca30c8c.zip",
+            "https://cache.hawkingrei.com/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20240516031922-38e0dca30c8c.zip",
+            "https://storage.googleapis.com/pingcapmirror/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20240516031922-38e0dca30c8c.zip",
+>>>>>>> 71821b758a4 (*: fix query panic when query exceeded resource group quota limitation (#53317))
         ],
     )
     go_repository(

go.mod

@@ -106,7 +106,11 @@ require (
 	github.com/tdakkota/asciicheck v0.2.0
 	github.com/tiancaiamao/appdash v0.0.0-20181126055449-889f96f722a2
 	github.com/tidwall/btree v1.7.0
+<<<<<<< HEAD
 	github.com/tikv/client-go/v2 v2.0.8-0.20240514061427-42cf70295f31
+=======
+	github.com/tikv/client-go/v2 v2.0.8-0.20240516031922-38e0dca30c8c
+>>>>>>> 71821b758a4 (*: fix query panic when query exceeded resource group quota limitation (#53317))
 	github.com/tikv/pd/client v0.0.0-20240430080403-1679dbca25b3
 	github.com/timakin/bodyclose v0.0.0-20240125160201-f835fa56326a
 	github.com/twmb/murmur3 v1.1.6

go.sum

@@ -867,8 +867,13 @@ github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a h1:J/YdBZ46WKpXsxsW
 github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a/go.mod h1:h4xBhSNtOeEosLJ4P7JyKXX7Cabg7AVkWCK5gV2vOrM=
 github.com/tidwall/btree v1.7.0 h1:L1fkJH/AuEh5zBnnBbmTwQ5Lt+bRJ5A8EWecslvo9iI=
 github.com/tidwall/btree v1.7.0/go.mod h1:twD9XRA5jj9VUQGELzDO4HPQTNJsoWWfYEL+EUQ2cKY=
+<<<<<<< HEAD
 github.com/tikv/client-go/v2 v2.0.8-0.20240514061427-42cf70295f31 h1:G4/JYl6deYs64+gX4Pmhbz/FRkMThqepU5eK1db8Eoc=
 github.com/tikv/client-go/v2 v2.0.8-0.20240514061427-42cf70295f31/go.mod h1:+vXk4Aex17GnI8gfSMPxrL0SQLbBYgP3Db4FvHiImwM=
+=======
+github.com/tikv/client-go/v2 v2.0.8-0.20240516031922-38e0dca30c8c h1:/bmadPQjII5T6EZBYIMnq1cbhfADzFOCtfCMZsCcFuw=
+github.com/tikv/client-go/v2 v2.0.8-0.20240516031922-38e0dca30c8c/go.mod h1:/4cCrzN6+KY2U5JeR72TllnJTtA5hm9yI6zqlNrvJUo=
+>>>>>>> 71821b758a4 (*: fix query panic when query exceeded resource group quota limitation (#53317))
 github.com/tikv/pd/client v0.0.0-20240430080403-1679dbca25b3 h1:1MReqAoXNPyTarVZ3cihghWrmczF6yj+tmBLkj7g9Oc=
 github.com/tikv/pd/client v0.0.0-20240430080403-1679dbca25b3/go.mod h1:FaQnRpX8ZXMR8pih4xNdNxqDrwZvpu7GMsJKDZyF9pk=
 github.com/timakin/bodyclose v0.0.0-20240125160201-f835fa56326a h1:A6uKudFIfAEpoPdaal3aSqGxBzLyU8TqyXImLwo6dIo=