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 schemachange failed caused by storage migration (backport #45517) #45565

Merged
merged 1 commit into from
May 13, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 13, 2024

Why I'm doing:

Schemachange will fail if tablet was migrated

What I'm doing:

When doing migration, check if tablet is in schemachange process, if so abort migration.

Fixes #45384

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

Schemachange will fail if tablet was migrated

What I'm doing:

When doing migration, check if tablet is in schemachange process, if so abort migration.

Fixes #45384

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 May 13, 2024
Copy link
Contributor Author

mergify bot commented May 13, 2024

Cherry-pick of 97fd498 has failed:

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

You are currently cherry-picking commit 97fd4982de.
  (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:   be/src/storage/task/engine_storage_migration_task.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   be/test/storage/task/engine_storage_migration_task_test.cpp

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

@wanpengfei-git wanpengfei-git enabled auto-merge (squash) May 13, 2024 14:50
@mergify mergify bot closed this May 13, 2024
auto-merge was automatically disabled May 13, 2024 14:51

Pull request was closed

Copy link
Contributor Author

mergify bot commented May 13, 2024

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

@mergify mergify bot deleted the mergify/bp/branch-2.5/pr-45517 branch May 13, 2024 14:52
@decster decster restored the mergify/bp/branch-2.5/pr-45517 branch May 13, 2024 15:37
@decster decster reopened this May 13, 2024
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) May 13, 2024 15:38
@decster decster force-pushed the mergify/bp/branch-2.5/pr-45517 branch from 0431995 to f414544 Compare May 13, 2024 15:46
@wanpengfei-git wanpengfei-git merged commit c0ee7bd into branch-2.5 May 13, 2024
27 checks passed
@wanpengfei-git wanpengfei-git deleted the mergify/bp/branch-2.5/pr-45517 branch May 13, 2024 16:06
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