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 tablet meta use tabletMeta uses partition_id and physical_partition_id at the same time to cause confusion(backport #52258) (backport #52373) #52375

Merged
merged 3 commits into from
Oct 29, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 28, 2024

This is an backport of pull request #52258

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 #52373 done by [Mergify](https://mergify.com). This is an backport of pull request https://github.com//pull/52258

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

#52373)

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

# Conflicts:
#	fe/fe-core/src/main/java/com/starrocks/catalog/Partition.java
#	fe/fe-core/src/main/java/com/starrocks/clone/DiskAndTabletLoadReBalancer.java
#	fe/fe-core/src/main/java/com/starrocks/clone/TabletChecker.java
#	fe/fe-core/src/main/java/com/starrocks/clone/TabletSchedCtx.java
#	fe/fe-core/src/main/java/com/starrocks/clone/TabletScheduler.java
#	fe/fe-core/src/main/java/com/starrocks/consistency/CheckConsistencyJob.java
#	fe/fe-core/src/main/java/com/starrocks/consistency/ConsistencyChecker.java
#	fe/fe-core/src/main/java/com/starrocks/lake/Utils.java
#	fe/fe-core/src/main/java/com/starrocks/leader/ReportHandler.java
#	fe/fe-core/src/main/java/com/starrocks/qe/ShowExecutor.java
#	fe/fe-core/src/main/java/com/starrocks/server/LocalMetastore.java
Copy link
Contributor Author

mergify bot commented Oct 28, 2024

Cherry-pick of bf04f84 has failed:

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

You are currently cherry-picking commit bf04f84df6.
  (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/alter/SchemaChangeJobV2.java
	modified:   fe/fe-core/src/main/java/com/starrocks/catalog/CatalogRecycleBin.java
	modified:   fe/fe-core/src/main/java/com/starrocks/catalog/TabletInvertedIndex.java
	modified:   fe/fe-core/src/main/java/com/starrocks/catalog/TabletMeta.java
	modified:   fe/fe-core/src/main/java/com/starrocks/clone/ColocateTableBalancer.java
	modified:   fe/fe-core/src/main/java/com/starrocks/common/proc/StatisticProcDir.java
	modified:   fe/fe-core/src/main/java/com/starrocks/leader/LeaderImpl.java
	modified:   fe/fe-core/src/main/java/com/starrocks/persist/ConsistencyCheckInfo.java
	modified:   fe/fe-core/src/main/java/com/starrocks/scheduler/mv/BinlogConsumeStateVO.java
	modified:   fe/fe-core/src/main/java/com/starrocks/task/TabletMetadataUpdateAgentTaskFactory.java
	modified:   fe/fe-core/src/main/java/com/starrocks/transaction/LakeTableTxnStateListener.java
	modified:   fe/fe-core/src/main/java/com/starrocks/transaction/OlapTableTxnStateListener.java
	modified:   fe/fe-core/src/test/java/com/starrocks/catalog/TempPartitionTest.java
	modified:   fe/fe-core/src/test/java/com/starrocks/leader/ReportHandlerTest.java

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   fe/fe-core/src/main/java/com/starrocks/catalog/Partition.java
	both modified:   fe/fe-core/src/main/java/com/starrocks/clone/DiskAndTabletLoadReBalancer.java
	both modified:   fe/fe-core/src/main/java/com/starrocks/clone/TabletChecker.java
	both modified:   fe/fe-core/src/main/java/com/starrocks/clone/TabletSchedCtx.java
	both modified:   fe/fe-core/src/main/java/com/starrocks/clone/TabletScheduler.java
	both modified:   fe/fe-core/src/main/java/com/starrocks/consistency/CheckConsistencyJob.java
	both modified:   fe/fe-core/src/main/java/com/starrocks/consistency/ConsistencyChecker.java
	both modified:   fe/fe-core/src/main/java/com/starrocks/lake/Utils.java
	both modified:   fe/fe-core/src/main/java/com/starrocks/leader/ReportHandler.java
	both modified:   fe/fe-core/src/main/java/com/starrocks/qe/ShowExecutor.java
	both modified:   fe/fe-core/src/main/java/com/starrocks/server/LocalMetastore.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 Oct 28, 2024

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

auto-merge was automatically disabled October 28, 2024 05:53

Pull request was closed

@meegoo meegoo reopened this Oct 28, 2024
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) October 28, 2024 23:38
meegoo
meegoo previously approved these changes Oct 29, 2024
@meegoo meegoo disabled auto-merge October 29, 2024 00:04
@meegoo meegoo enabled auto-merge (squash) October 29, 2024 00:04
@meegoo meegoo disabled auto-merge October 29, 2024 18:19
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) October 29, 2024 20:36
@meegoo meegoo disabled auto-merge October 29, 2024 20:36
@meegoo meegoo enabled auto-merge (squash) October 29, 2024 20:37
Copy link

@meegoo meegoo merged commit d665d86 into branch-3.2 Oct 29, 2024
28 of 29 checks passed
@meegoo meegoo deleted the mergify/bp/branch-3.2/pr-52373 branch October 29, 2024 21:08
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