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] Add more detailed logging for commit transaction scenarios. (backport #49083) #49177

Merged
merged 1 commit into from
Aug 1, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 30, 2024

Why I'm doing:

What I'm doing:

Fixes #49084

Add more detailed logging for commit transaction scenarios.

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

What I'm doing:

Fixes #49084

Add more detailed logging for commit transaction scenarios.

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

@mergify mergify bot added the conflicts label Jul 30, 2024
Copy link
Contributor Author

mergify bot commented Jul 30, 2024

Cherry-pick of 9a6256d has failed:

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

You are currently cherry-picking commit 9a6256d6ba.
  (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:   fe/fe-core/src/main/java/com/starrocks/catalog/Replica.java

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   fe/fe-core/src/main/java/com/starrocks/transaction/GlobalTransactionMgr.java

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 Jul 30, 2024

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

auto-merge was automatically disabled July 30, 2024 18:56

Pull request was closed

@mergify mergify bot deleted the mergify/bp/branch-2.5/pr-49083 branch July 30, 2024 18:57
@decster decster restored the mergify/bp/branch-2.5/pr-49083 branch August 1, 2024 02:25
@decster decster reopened this Aug 1, 2024
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) August 1, 2024 02:25
…ios. (#49083)

Fixes #49084

Add more detailed logging for commit transaction scenarios.

Signed-off-by: edwinhzhang <[email protected]>
(cherry picked from commit 9a6256d)
@decster decster force-pushed the mergify/bp/branch-2.5/pr-49083 branch from 4782402 to 1d2b471 Compare August 1, 2024 02:38
Copy link

sonarcloud bot commented Aug 1, 2024

@wanpengfei-git wanpengfei-git merged commit d921766 into branch-2.5 Aug 1, 2024
31 of 32 checks passed
@wanpengfei-git wanpengfei-git deleted the mergify/bp/branch-2.5/pr-49083 branch August 1, 2024 02:56
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.

3 participants