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

[Enhancement] Log the content of journal entity on replay failure (backport #46011) #46029

Merged
merged 6 commits into from
May 23, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 21, 2024

Fixes #46012

Also we shouldn't catch the exception when replaying create table failed,
This will cause the following log replay failure and hard to address the root cause.

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 #46011 done by [Mergify](https://mergify.com). Fixes #46012

Also we shouldn't catch the exception when replaying create table failed,
This will cause the following log replay failure and hard to address the root cause.

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

…6011)

Signed-off-by: Dejun Xia <[email protected]>
(cherry picked from commit 759125c)

# Conflicts:
#	fe/fe-core/src/main/java/com/starrocks/persist/metablock/SRMetaBlockReader.java
#	fe/fe-core/src/main/java/com/starrocks/server/GlobalStateMgr.java
#	fe/fe-core/src/main/java/com/starrocks/server/LocalMetastore.java
@mergify mergify bot added the conflicts label May 21, 2024
Copy link
Contributor Author

mergify bot commented May 21, 2024

Cherry-pick of 759125c has failed:

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

You are currently cherry-picking commit 759125c841.
  (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:   fe/fe-core/src/main/java/com/starrocks/persist/metablock/SRMetaBlockReader.java
	both modified:   fe/fe-core/src/main/java/com/starrocks/server/GlobalStateMgr.java
	both modified:   fe/fe-core/src/main/java/com/starrocks/server/LocalMetastore.java

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

Copy link
Contributor Author

mergify bot commented May 21, 2024

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

@mergify mergify bot deleted the mergify/bp/branch-2.5/pr-46011 branch May 21, 2024 12:23
@nshangyiming nshangyiming restored the mergify/bp/branch-2.5/pr-46011 branch May 21, 2024 12:27
@nshangyiming nshangyiming reopened this May 21, 2024
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) May 21, 2024 12:28
nshangyiming
nshangyiming previously approved these changes May 22, 2024
nshangyiming
nshangyiming previously approved these changes May 23, 2024
Copy link

@wanpengfei-git wanpengfei-git merged commit bfdb05d into branch-2.5 May 23, 2024
31 of 32 checks passed
@wanpengfei-git wanpengfei-git deleted the mergify/bp/branch-2.5/pr-46011 branch May 23, 2024 03: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