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 replaying AlterJob NPE Bug (backport #50100) #50107

Merged
merged 2 commits into from
Aug 21, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 21, 2024

Why I'm doing:

What I'm doing:

The root cause of this bug is that the span attribute is null after restarting FE, causing NPE to be thrown when calling span. Add a default constructor to each subclass of AlterJobV2 so that span will be set to a default value after deserialization.

Fixes #50101

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

What I'm doing:

The root cause of this bug is that the span attribute is null after restarting FE, causing NPE to be thrown when calling span. Add a default constructor to each subclass of AlterJobV2 so that span will be set to a default value after deserialization.

Fixes #50101

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

Signed-off-by: gengjun-git <[email protected]>
(cherry picked from commit f721fd4)

# Conflicts:
#	fe/fe-core/src/main/java/com/starrocks/alter/LakeTableAsyncFastSchemaChangeJob.java
#	fe/fe-core/src/main/java/com/starrocks/alter/LakeTableSchemaChangeJob.java
#	fe/fe-core/src/main/java/com/starrocks/alter/OnlineOptimizeJobV2.java
#	fe/fe-core/src/main/java/com/starrocks/alter/RollupJobV2.java
Copy link
Contributor Author

mergify bot commented Aug 21, 2024

Cherry-pick of f721fd4 has failed:

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

You are currently cherry-picking commit f721fd4bec.
  (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/LakeTableAlterMetaJob.java
	modified:   fe/fe-core/src/main/java/com/starrocks/alter/LakeTableAlterMetaJobBase.java
	modified:   fe/fe-core/src/main/java/com/starrocks/alter/OptimizeJobV2.java
	modified:   fe/fe-core/src/main/java/com/starrocks/alter/SchemaChangeJobV2.java

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   fe/fe-core/src/main/java/com/starrocks/alter/LakeTableAsyncFastSchemaChangeJob.java
	both modified:   fe/fe-core/src/main/java/com/starrocks/alter/LakeTableSchemaChangeJob.java
	deleted by us:   fe/fe-core/src/main/java/com/starrocks/alter/OnlineOptimizeJobV2.java
	both modified:   fe/fe-core/src/main/java/com/starrocks/alter/RollupJobV2.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 Aug 21, 2024

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

@mergify mergify bot deleted the mergify/bp/branch-3.2/pr-50100 branch August 21, 2024 13:51
@gengjun-git gengjun-git restored the mergify/bp/branch-3.2/pr-50100 branch August 21, 2024 13:54
Signed-off-by: gengjun-git <[email protected]>
@gengjun-git gengjun-git reopened this Aug 21, 2024
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) August 21, 2024 13:55
@wanpengfei-git wanpengfei-git merged commit f61f51a into branch-3.2 Aug 21, 2024
38 of 39 checks passed
@wanpengfei-git wanpengfei-git deleted the mergify/bp/branch-3.2/pr-50100 branch August 21, 2024 13:57
Copy link

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