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 potential thread safe issue about pindex major compact (backport #44238) #44265

Merged
merged 2 commits into from
Apr 17, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 17, 2024

Why I'm doing:

major compact thread will access _fs concurrently with apply thread, it's not thread safe here.

What I'm doing:

fix it.

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 #44238 done by [Mergify](https://mergify.com). ## Why I'm doing: major compact thread will access _fs concurrently with apply thread, it's not thread safe here.

What I'm doing:

fix it.

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

…44238)

Signed-off-by: luohaha <[email protected]>
(cherry picked from commit 8fecf68)

# Conflicts:
#	be/src/storage/persistent_index.cpp
@mergify mergify bot added the conflicts label Apr 17, 2024
Copy link
Contributor Author

mergify bot commented Apr 17, 2024

Cherry-pick of 8fecf68 has failed:

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

You are currently cherry-picking commit 8fecf680cf.
  (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)

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

no changes added to commit (use "git add" and/or "git commit -a")

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

@wanpengfei-git wanpengfei-git enabled auto-merge (squash) April 17, 2024 09:43
@mergify mergify bot closed this Apr 17, 2024
auto-merge was automatically disabled April 17, 2024 09:43

Pull request was closed

Copy link
Contributor Author

mergify bot commented Apr 17, 2024

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

@mergify mergify bot deleted the mergify/bp/branch-2.5/pr-44238 branch April 17, 2024 09:44
@luohaha luohaha restored the mergify/bp/branch-2.5/pr-44238 branch April 17, 2024 11:17
@luohaha luohaha reopened this Apr 17, 2024
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) April 17, 2024 11:17
Signed-off-by: Yixin Luo <[email protected]>
@wanpengfei-git wanpengfei-git merged commit 0746244 into branch-2.5 Apr 17, 2024
30 of 31 checks passed
@wanpengfei-git wanpengfei-git deleted the mergify/bp/branch-2.5/pr-44238 branch April 17, 2024 11:41
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