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.

Sign up for GitHub

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

Jump to bottom

[BugFix] Fix loads syncer wrong replication num property (backport #52220) #52458

Merged
merged 4 commits into from
Oct 31, 2024
Merged

[BugFix] Fix loads syncer wrong replication num property (backport #52220) #52458

merged 4 commits into from
Oct 31, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 30, 2024 •
edited by wanpengfei-git
Loading

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 #52220 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

@meegoo @mergify
[BugFix] Fix loads syncer wrong replication num property (#52220)
23cb7c1 
Signed-off-by: meegoo <[email protected]>
(cherry picked from commit 050b92a)

# Conflicts:
#	fe/fe-core/src/main/java/com/starrocks/load/loadv2/LoadsHistorySyncer.java
@mergify mergify bot added the conflicts label Oct 30, 2024
@mergify Mergify
Copy link
Contributor Author

mergify bot commented Oct 30, 2024

Cherry-pick of 050b92a has failed:

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

You are currently cherry-picking commit 050b92abc1.
  (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/common/Config.java
	modified:   fe/fe-core/src/main/java/com/starrocks/scheduler/history/TableKeeper.java

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   fe/fe-core/src/main/java/com/starrocks/load/loadv2/LoadsHistorySyncer.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

@mergify mergify bot mentioned this pull request Oct 30, 2024
Merged
24 tasks
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) October 30, 2024 03:17
@mergify mergify bot closed this Oct 30, 2024
@mergify Mergify
Copy link
Contributor Author

mergify bot commented Oct 30, 2024

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

auto-merge was automatically disabled October 30, 2024 03:17

Pull request was closed

@meegoo meegoo reopened this Oct 30, 2024
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) October 30, 2024 03:23
@meegoo meegoo disabled auto-merge October 30, 2024 03:25
@meegoo meegoo enabled auto-merge (squash) October 30, 2024 03:25
@meegoo meegoo disabled auto-merge October 30, 2024 03:42
@meegoo meegoo enabled auto-merge (squash) October 30, 2024 03:42
@meegoo meegoo disabled auto-merge October 30, 2024 05:41
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) October 30, 2024 05:41
@sonarqubecloud SonarQubeCloud
Copy link

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarCloud

@wanpengfei-git wanpengfei-git merged commit 05b411e into branch-3.3 Oct 31, 2024
27 of 28 checks passed
@wanpengfei-git wanpengfei-git deleted the mergify/bp/branch-3.3/pr-52220 branch October 31, 2024 17:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@meegoo meegoo meegoo approved these changes

Assignees

@meegoo meegoo

Labels
automerge conflicts version:3.3.6
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@meegoo @wanpengfei-git