Skip to content

importer: fixing the import block issue when on cloud#18330

Merged
ti-chi-bot[bot] merged 5 commits intotikv:masterfrom
3pointer:fix_import_block
Mar 21, 2025
Merged

importer: fixing the import block issue when on cloud#18330
ti-chi-bot[bot] merged 5 commits intotikv:masterfrom
3pointer:fix_import_block

Conversation

@3pointer
Copy link
Contributor

@3pointer 3pointer commented Mar 21, 2025 •
edited
Loading

What is changed and how it works?

Issue Number: Close #18328

What's Changed:

  1. Fixed an issue where block_in_place yields on the current thread, but other threads attempt to acquire the DashMap lock, potentially causing a deadlock.
  2. This issue is more likely to occur in cloud environments with constrained threading models.
importer: fixing the import block issue when on cloud

Related changes

  • PR to update pingcap/docs/pingcap/docs-cn:
  • Need to cherry-pick to the release branch

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No code

Side effects

  • Performance regression: Consumes more CPU
  • Performance regression: Consumes more Memory
  • Breaking backward compatibility

Release note

None

@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Mar 21, 2025

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@ti-chi-bot ti-chi-bot bot added do-not-merge/needs-linked-issue do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. dco-signoff: yes Indicates the PR's author has signed the dco. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Mar 21, 2025
3pointer added 3 commits March 21, 2025 14:07
@3pointer
importer: fix block on get credential
9a0cd5c 
Signed-off-by: 3pointer <luancheng@pingcap.com>
@3pointer
add test case
8db67ff 
Signed-off-by: 3pointer <luancheng@pingcap.com>
@3pointer
Merge branch 'master' into fix_import_block
0c78fd2
@ti-chi-bot ti-chi-bot bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Mar 21, 2025
3pointer added 2 commits March 21, 2025 16:54
@3pointer
fix conflict
70597bc 
Signed-off-by: 3pointer <luancheng@pingcap.com>
@3pointer
make clippy
54586f5 
Signed-off-by: 3pointer <luancheng@pingcap.com>
@3pointer 3pointer changed the title [DNM]: fixing the import block issue when on cloud importer: fixing the import block issue when on cloud Mar 21, 2025
@ti-chi-bot ti-chi-bot bot added release-note-none Denotes a PR that doesn't merit a release note. do-not-merge/needs-triage-completed and removed do-not-merge/needs-linked-issue do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Mar 21, 2025
@3pointer 3pointer requested a review from YuJuncen March 21, 2025 09:12
@ti-chi-bot ti-chi-bot bot added the needs-cherry-pick-release-9.0-beta.1 Should cherry pick this PR to release-9.0-beta.1 branch. label Mar 21, 2025
@3pointer 3pointer marked this pull request as ready for review March 21, 2025 09:12
@ti-chi-bot ti-chi-bot bot removed do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. do-not-merge/needs-triage-completed labels Mar 21, 2025
@ti-chi-bot ti-chi-bot bot added needs-1-more-lgtm Indicates a PR needs 1 more LGTM. approved labels Mar 21, 2025
@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Mar 21, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Leavrth, YuJuncen

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ti-chi-bot ti-chi-bot bot added the lgtm label Mar 21, 2025
@ti-chi-bot ti-chi-bot bot removed the needs-1-more-lgtm Indicates a PR needs 1 more LGTM. label Mar 21, 2025
@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Mar 21, 2025

[LGTM Timeline notifier]

Timeline:

  • 2025-03-21 09:16:15.745495894 +0000 UTC m=+606269.429732002: ☑️ agreed by YuJuncen.
  • 2025-03-21 09:40:24.030197792 +0000 UTC m=+607717.714433887: ☑️ agreed by Leavrth.

@ti-chi-bot ti-chi-bot bot merged commit e5a3075 into tikv:master Mar 21, 2025
8 checks passed
@ti-chi-bot ti-chi-bot bot added this to the Pool milestone Mar 21, 2025
ti-chi-bot pushed a commit to ti-chi-bot/tikv that referenced this pull request Mar 21, 2025
@3pointer @ti-chi-bot
importer: fixing the import block issue when on cloud (tikv#18330)
406dad4 
close tikv#18328

importer: fixing the import block issue when on cloud

Signed-off-by: 3pointer <luancheng@pingcap.com>
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Mar 21, 2025

In response to a cherrypick label: new pull request created to branch release-9.0-beta.1: #18334.

@ti-chi-bot ti-chi-bot mentioned this pull request Mar 21, 2025
Merged
9 tasks
ti-chi-bot bot pushed a commit that referenced this pull request Mar 21, 2025
@ti-chi-bot @3pointer
importer: fixing the import block issue when on cloud (#18330) (#18334)
0a97ca8 
close #18328

importer: fixing the import block issue when on cloud

Signed-off-by: 3pointer <luancheng@pingcap.com>

Co-authored-by: 3pointer <luancheng@pingcap.com>
This was referenced Mar 24, 2025
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@YuJuncen YuJuncen YuJuncen approved these changes

+1 more reviewer

@Leavrth Leavrth Leavrth approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

approved dco-signoff: yes Indicates the PR's author has signed the dco. lgtm needs-cherry-pick-release-9.0-beta.1 Should cherry pick this PR to release-9.0-beta.1 branch. release-note-none Denotes a PR that doesn't merit a release note. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Milestone

Pool

Development

Successfully merging this pull request may close these issues.

v9.0.0-beta.1 cluster fails to restore on TiDB Cloud

4 participants

@3pointer @ti-chi-bot @YuJuncen @Leavrth