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] Check the return value after load primary index in pk compaction (backport #42221) #42595

Merged
merged 7 commits into from
Mar 18, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 14, 2024

Why I'm doing:

During PK compaction, we should check the return value after load primary index and we should cancel compaction
if load primary index failed.

What I'm doing:

Check the return value.

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.2
    • 3.1
    • 3.0
    • 2.5

This is an automatic backport of pull request #42221 done by [Mergify](https://mergify.com). ## Why I'm doing: During PK compaction, we should check the return value after load primary index and we should cancel compaction if load primary index failed.

What I'm doing:

Check the return value.

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

…tion (#42221)

Signed-off-by: zhangqiang <[email protected]>
(cherry picked from commit 4d02de5)

# Conflicts:
#	be/src/storage/primary_index.h
#	be/src/storage/tablet_updates.cpp
#	be/src/storage/tablet_updates.h
#	be/test/storage/tablet_updates_test.cpp
@mergify mergify bot added the conflicts label Mar 14, 2024
Copy link
Contributor Author

mergify bot commented Mar 14, 2024

Cherry-pick of 4d02de5 has failed:

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

You are currently cherry-picking commit 4d02de56d8.
  (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/primary_index.h
	both modified:   be/src/storage/tablet_updates.cpp
	both modified:   be/src/storage/tablet_updates.h
	both modified:   be/test/storage/tablet_updates_test.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) March 14, 2024 03:06
@mergify mergify bot closed this Mar 14, 2024
auto-merge was automatically disabled March 14, 2024 03:06

Pull request was closed

Copy link
Contributor Author

mergify bot commented Mar 14, 2024

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

@mergify mergify bot deleted the mergify/bp/branch-2.5/pr-42221 branch March 14, 2024 03:06
@sevev sevev restored the mergify/bp/branch-2.5/pr-42221 branch March 14, 2024 07:30
@sevev sevev reopened this Mar 14, 2024
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) March 14, 2024 07:31
Signed-off-by: zhangqiang <[email protected]>
Signed-off-by: zhangqiang <[email protected]>
Signed-off-by: zhangqiang <[email protected]>
Signed-off-by: zhangqiang <[email protected]>
Signed-off-by: zhangqiang <[email protected]>
sevev
sevev previously approved these changes Mar 18, 2024
Signed-off-by: zhangqiang <[email protected]>
@wanpengfei-git wanpengfei-git merged commit 663eaee into branch-2.5 Mar 18, 2024
23 checks passed
@wanpengfei-git wanpengfei-git deleted the mergify/bp/branch-2.5/pr-42221 branch March 18, 2024 07:18
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