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] Add failure handle and warning log for delta writer not exist (backport #46593) #46612

Merged
merged 2 commits into from
Jun 7, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 4, 2024

Why I'm doing:

What I'm doing:

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 #46593 done by [Mergify](https://mergify.com). ## Why I'm doing:

What I'm doing:

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

#46593)

Signed-off-by: meegoo <[email protected]>
(cherry picked from commit 90a10ba)

# Conflicts:
#	be/src/runtime/lake_tablets_channel.cpp
@mergify mergify bot added the conflicts label Jun 4, 2024
Copy link
Contributor Author

mergify bot commented Jun 4, 2024

Cherry-pick of 90a10ba has failed:

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

You are currently cherry-picking commit 90a10ba157.
  (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/runtime/local_tablets_channel.cpp

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

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

Copy link
Contributor Author

mergify bot commented Jun 4, 2024

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

@mergify mergify bot deleted the mergify/bp/branch-2.5/pr-46593 branch June 4, 2024 06:20
@meegoo meegoo restored the mergify/bp/branch-2.5/pr-46593 branch June 7, 2024 08:58
@meegoo meegoo reopened this Jun 7, 2024
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) June 7, 2024 08:59
@meegoo meegoo disabled auto-merge June 7, 2024 08:59
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) June 7, 2024 08:59
@meegoo meegoo disabled auto-merge June 7, 2024 09:00
@meegoo meegoo enabled auto-merge (squash) June 7, 2024 09:00
@meegoo meegoo merged commit 97f1b14 into branch-2.5 Jun 7, 2024
31 checks passed
@meegoo meegoo deleted the mergify/bp/branch-2.5/pr-46593 branch June 7, 2024 09:19
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.

1 participant