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 backend node lastStartTime updated by hbTime unexpectedly (backport #52704) #52723

Merged
merged 2 commits into from
Nov 9, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 8, 2024

  • stick to the reboot time reported by backend
  • fall back to heartbeat response time if backend response doesn't have the reboot time set

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 #52704 done by [Mergify](https://mergify.com). * stick to the reboot time reported by backend * fall back to heartbeat response time if backend response doesn't have the reboot time set

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

#52704)

Signed-off-by: Kevin Xiaohua Cai <[email protected]>
(cherry picked from commit b2cf5e7)

# Conflicts:
#	fe/fe-core/src/main/java/com/starrocks/system/ComputeNode.java
#	fe/fe-core/src/test/java/com/starrocks/system/ComputeNodeTest.java
Copy link
Contributor Author

mergify bot commented Nov 8, 2024

Cherry-pick of b2cf5e7 has failed:

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

You are currently cherry-picking commit b2cf5e7cd2.
  (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/system/ComputeNode.java
	both modified:   fe/fe-core/src/test/java/com/starrocks/system/ComputeNodeTest.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 Nov 8, 2024

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

Signed-off-by: Kevin Xiaohua Cai <[email protected]>
@kevincai kevincai reopened this Nov 9, 2024
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) November 9, 2024 11:43
Copy link

sonarcloud bot commented Nov 9, 2024

@wanpengfei-git wanpengfei-git merged commit 286f598 into branch-3.2 Nov 9, 2024
35 of 36 checks passed
@wanpengfei-git wanpengfei-git deleted the mergify/bp/branch-3.2/pr-52704 branch November 9, 2024 12:12
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