Skip to content

Fix the potential concurrency problem when clone the shared delta index (#2030)#2032

Merged
lidezhu merged 2 commits intopingcap:release-4.0from
ti-srebot:release-4.0-1076ba58a438
May 31, 2021
Merged

Fix the potential concurrency problem when clone the shared delta index (#2030)#2032
lidezhu merged 2 commits intopingcap:release-4.0from
ti-srebot:release-4.0-1076ba58a438

Conversation

@ti-srebot
Copy link
Collaborator

@ti-srebot ti-srebot commented May 31, 2021 •
edited
Loading

cherry-pick #2030 to release-4.0
You can switch your code base to this Pull Request by using git-extras:

# In tics repo:
git pr https://github.com/pingcap/tics/pull/2032

After apply modifications, you can push your change to this PR via:

git push git@github.com:ti-srebot/tics.git pr/2032:release-4.0-1076ba58a438

What problem does this PR solve?

Issue Number: close #2023

Problem Summary: The clone process of the DeltaIndex is not protected by mutex.

What is changed and how it works?

Proposal: xxx

What's Changed:

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

Release note

  • Fix the potential concurrency problem when clone the shared delta index.

@lidezhu @ti-srebot
cherry pick #2030 to release-4.0
0cb4ba2 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot added CHERRY-PICK cherry pick status/LGT1 Indicates that a PR has LGTM 1. labels May 31, 2021
@ti-srebot ti-srebot mentioned this pull request May 31, 2021
Merged
@ti-srebot ti-srebot added the type/bugfix This PR fixes a bug. label May 31, 2021
@ti-srebot ti-srebot added this to the v4.0.14 milestone May 31, 2021
flowbehappy
flowbehappy previously approved these changes May 31, 2021
View reviewed changes
Copy link
Contributor

@flowbehappy flowbehappy left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please fix conflicts.

flowbehappy
flowbehappy reviewed May 31, 2021
View reviewed changes
dbms/src/Storages/DeltaMerge/DeltaIndex.h Outdated
Copy link
Contributor

@flowbehappy flowbehappy May 31, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix this

Copy link
Contributor

@lidezhu lidezhu May 31, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed.

@flowbehappy flowbehappy self-requested a review May 31, 2021 10:51
@flowbehappy flowbehappy dismissed their stale review May 31, 2021 10:53

Need fix

@lidezhu
Copy link
Contributor

lidezhu commented May 31, 2021

/run-all-tests

flowbehappy
flowbehappy approved these changes May 31, 2021
View reviewed changes
Copy link
Contributor

@flowbehappy flowbehappy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@lidezhu lidezhu merged commit 9c49fa2 into pingcap:release-4.0 May 31, 2021
@lidezhu lidezhu deleted the release-4.0-1076ba58a438 branch May 31, 2021 15:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@lidezhu lidezhu lidezhu left review comments

@flowbehappy flowbehappy flowbehappy approved these changes

@JaySon-Huang JaySon-Huang Awaiting requested review from JaySon-Huang

Assignees

@lidezhu lidezhu

Labels

CHERRY-PICK cherry pick status/LGT1 Indicates that a PR has LGTM 1. type/bugfix This PR fixes a bug.

Projects

None yet

Milestone

v4.0.14

Development

Successfully merging this pull request may close these issues.

3 participants

@ti-srebot @lidezhu @flowbehappy