Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[BugFix] fix pk concurrent apply issue (backport #51225) #51287

Merged
merged 2 commits into from
Sep 24, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 23, 2024

Why I'm doing:

If we drop tablet with flag kKeepMetaAndFiles, we will remove this tablet from memory directly. However, if the tablet is the primary key table, there might still be ongoing apply tasks. We should stop the background apply tasks before deleting it; otherwise, if a new tablet is created, there could be a scenario where apply tasks are executed simultaneously.
e.g.

  1. drop and clone a new tablet with the same tablet_id.
  2. compact rocksdb meta and reload tablet again.

What I'm doing:

Stop running apply task first before remove the tablet from memory.

Fixes #issue

What type of PR is this:

  • BugFix
  • Feature
  • Enhancement
  • Refactor
  • UT
  • Doc
  • Tool

Does this PR entail a change in behavior?

  • Yes, this PR will result in a change in behavior.
  • No, this PR will not result in a change in behavior.

If yes, please specify the type of change:

  • Interface/UI changes: syntax, type conversion, expression evaluation, display information
  • Parameter changes: default values, similar parameters but with different default values
  • Policy changes: use new policy to replace old one, functionality automatically enabled
  • Feature removed
  • Miscellaneous: upgrade & downgrade compatibility, etc.

Checklist:

  • I have added test cases for my bug fix or my new feature
  • This pr needs user documentation (for new or modified features or behaviors)
    • I have added documentation for my new feature or new function
  • This is a backport pr

Bugfix cherry-pick branch check:

  • I have checked the version labels which the pr will be auto-backported to the target branch
    • 3.3
    • 3.2
    • 3.1
    • 3.0
    • 2.5

This is an automatic backport of pull request #51225 done by [Mergify](https://mergify.com). ## Why I'm doing: If we drop tablet with flag `kKeepMetaAndFiles`, we will remove this tablet from memory directly. However, if the tablet is the primary key table, there might still be ongoing apply tasks. We should stop the background apply tasks before deleting it; otherwise, if a new tablet is created, there could be a scenario where apply tasks are executed simultaneously. e.g. 1. drop and clone a new tablet with the same tablet_id. 2. compact rocksdb meta and reload tablet again.

What I'm doing:

Stop running apply task first before remove the tablet from memory.

Fixes #issue

What type of PR is this:

  • BugFix
  • Feature
  • Enhancement
  • Refactor
  • UT
  • Doc
  • Tool

Does this PR entail a change in behavior?

  • Yes, this PR will result in a change in behavior.
  • No, this PR will not result in a change in behavior.

If yes, please specify the type of change:

  • Interface/UI changes: syntax, type conversion, expression evaluation, display information
  • Parameter changes: default values, similar parameters but with different default values
  • Policy changes: use new policy to replace old one, functionality automatically enabled
  • Feature removed
  • Miscellaneous: upgrade & downgrade compatibility, etc.

Checklist:

  • I have added test cases for my bug fix or my new feature
  • This pr needs user documentation (for new or modified features or behaviors)
    • I have added documentation for my new feature or new function
  • This is a backport pr

Signed-off-by: sevev <[email protected]>
(cherry picked from commit 9dba8da)

# Conflicts:
#	be/src/storage/base_tablet.h
Copy link
Contributor Author

mergify bot commented Sep 23, 2024

Cherry-pick of 9dba8da has failed:

On branch mergify/bp/branch-3.2/pr-51225
Your branch is up to date with 'origin/branch-3.2'.

You are currently cherry-picking commit 9dba8da03d.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   be/src/storage/tablet.h
	modified:   be/src/storage/tablet_manager.cpp
	modified:   be/src/storage/tablet_updates.h
	modified:   be/test/storage/tablet_updates_test.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   be/src/storage/base_tablet.h

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot added the conflicts label Sep 23, 2024
@mergify mergify bot mentioned this pull request Sep 23, 2024
24 tasks
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) September 23, 2024 15:58
@mergify mergify bot closed this Sep 23, 2024
Copy link
Contributor Author

mergify bot commented Sep 23, 2024

@mergify[bot]: Backport conflict, please reslove the conflict and resubmit the pr

auto-merge was automatically disabled September 23, 2024 15:58

Pull request was closed

@sevev sevev reopened this Sep 24, 2024
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) September 24, 2024 02:06
Signed-off-by: sevev <[email protected]>
@wanpengfei-git wanpengfei-git merged commit d440901 into branch-3.2 Sep 24, 2024
28 of 29 checks passed
@wanpengfei-git wanpengfei-git deleted the mergify/bp/branch-3.2/pr-51225 branch September 24, 2024 02:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants