-
Notifications
You must be signed in to change notification settings - Fork 13k
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
[FLINK-35465][runtime] Introduce BatchJobRecoveryHandler for recovery of batch jobs from JobMaster failures. #24771
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
JunRuiLee
force-pushed
the
jm_fo_main
branch
2 times, most recently
from
May 13, 2024 02:37
20ab25f
to
36c0da2
Compare
zhuzhurk
reviewed
May 14, 2024
...e/src/main/java/org/apache/flink/runtime/scheduler/adaptivebatch/AdaptiveBatchScheduler.java
Outdated
Show resolved
Hide resolved
JunRuiLee
force-pushed
the
jm_fo_main
branch
4 times, most recently
from
May 19, 2024 10:48
6368530
to
13c231d
Compare
zhuzhurk
reviewed
May 21, 2024
flink-runtime/src/main/java/org/apache/flink/runtime/shuffle/JobShuffleContext.java
Show resolved
Hide resolved
flink-runtime/src/main/java/org/apache/flink/runtime/shuffle/ShuffleMaster.java
Show resolved
Hide resolved
flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/JobMasterTest.java
Outdated
Show resolved
Hide resolved
...apache/flink/runtime/executiongraph/failover/RestartPipelinedRegionFailoverStrategyTest.java
Outdated
Show resolved
Hide resolved
flink-runtime/src/main/java/org/apache/flink/runtime/scheduler/DefaultScheduler.java
Outdated
Show resolved
Hide resolved
flink-runtime/src/main/java/org/apache/flink/runtime/scheduler/DefaultScheduler.java
Outdated
Show resolved
Hide resolved
flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/JobVertex.java
Outdated
Show resolved
Hide resolved
flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/JobVertex.java
Outdated
Show resolved
Hide resolved
zhuzhurk
reviewed
May 21, 2024
flink-core-api/src/main/java/org/apache/flink/util/function/ConsumerWithException.java
Outdated
Show resolved
Hide resolved
flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/IOMetrics.java
Outdated
Show resolved
Hide resolved
...time/src/main/java/org/apache/flink/runtime/source/coordinator/SourceCoordinatorContext.java
Show resolved
Hide resolved
flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/Execution.java
Outdated
Show resolved
Hide resolved
flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/Execution.java
Show resolved
Hide resolved
.../src/main/java/org/apache/flink/runtime/scheduler/adaptivebatch/BatchJobRecoveryHandler.java
Outdated
Show resolved
Hide resolved
JunRuiLee
force-pushed
the
jm_fo_main
branch
2 times, most recently
from
May 22, 2024 05:12
eb02365
to
e50adee
Compare
zhuzhurk
reviewed
May 22, 2024
...main/java/org/apache/flink/runtime/scheduler/adaptivebatch/DummyBatchJobRecoveryHandler.java
Outdated
Show resolved
Hide resolved
.../src/main/java/org/apache/flink/runtime/scheduler/strategy/VertexwiseSchedulingStrategy.java
Outdated
Show resolved
Hide resolved
...e/src/main/java/org/apache/flink/runtime/scheduler/adaptivebatch/AdaptiveBatchScheduler.java
Outdated
Show resolved
Hide resolved
...e/src/main/java/org/apache/flink/runtime/scheduler/adaptivebatch/AdaptiveBatchScheduler.java
Outdated
Show resolved
Hide resolved
...e/src/main/java/org/apache/flink/runtime/scheduler/adaptivebatch/AdaptiveBatchScheduler.java
Outdated
Show resolved
Hide resolved
...e/src/main/java/org/apache/flink/runtime/scheduler/adaptivebatch/AdaptiveBatchScheduler.java
Show resolved
Hide resolved
.../src/main/java/org/apache/flink/runtime/scheduler/adaptivebatch/BatchJobRecoveryHandler.java
Outdated
Show resolved
Hide resolved
.../src/main/java/org/apache/flink/runtime/scheduler/adaptivebatch/BatchJobRecoveryHandler.java
Outdated
Show resolved
Hide resolved
...e/src/main/java/org/apache/flink/runtime/scheduler/adaptivebatch/AdaptiveBatchScheduler.java
Show resolved
Hide resolved
flink-runtime/src/main/java/org/apache/flink/runtime/scheduler/strategy/SchedulingStrategy.java
Outdated
Show resolved
Hide resolved
zhuzhurk
reviewed
May 22, 2024
...in/java/org/apache/flink/runtime/scheduler/adaptivebatch/DefaultBatchJobRecoveryHandler.java
Outdated
Show resolved
Hide resolved
...in/java/org/apache/flink/runtime/scheduler/adaptivebatch/DefaultBatchJobRecoveryHandler.java
Outdated
Show resolved
Hide resolved
...in/java/org/apache/flink/runtime/scheduler/adaptivebatch/DefaultBatchJobRecoveryHandler.java
Outdated
Show resolved
Hide resolved
...in/java/org/apache/flink/runtime/scheduler/adaptivebatch/DefaultBatchJobRecoveryHandler.java
Outdated
Show resolved
Hide resolved
...in/java/org/apache/flink/runtime/scheduler/adaptivebatch/DefaultBatchJobRecoveryHandler.java
Outdated
Show resolved
Hide resolved
...in/java/org/apache/flink/runtime/scheduler/adaptivebatch/DefaultBatchJobRecoveryHandler.java
Outdated
Show resolved
Hide resolved
...in/java/org/apache/flink/runtime/scheduler/adaptivebatch/DefaultBatchJobRecoveryHandler.java
Outdated
Show resolved
Hide resolved
...in/java/org/apache/flink/runtime/scheduler/adaptivebatch/DefaultBatchJobRecoveryHandler.java
Outdated
Show resolved
Hide resolved
...in/java/org/apache/flink/runtime/scheduler/adaptivebatch/DefaultBatchJobRecoveryHandler.java
Outdated
Show resolved
Hide resolved
...e/src/main/java/org/apache/flink/runtime/scheduler/adaptivebatch/AdaptiveBatchScheduler.java
Outdated
Show resolved
Hide resolved
Thanks @zhuzhurk for reviewing, I've updated this pr accordingly. PTAL. |
zhuzhurk
reviewed
May 23, 2024
flink-runtime/src/main/java/org/apache/flink/runtime/jobmaster/JobMaster.java
Outdated
Show resolved
Hide resolved
flink-runtime/src/main/java/org/apache/flink/runtime/jobmaster/JobMaster.java
Outdated
Show resolved
Hide resolved
flink-runtime/src/main/java/org/apache/flink/runtime/jobmaster/JobMaster.java
Show resolved
Hide resolved
flink-runtime/src/main/java/org/apache/flink/runtime/jobmaster/JobMaster.java
Outdated
Show resolved
Hide resolved
…te parallelism store. This commit is to maintain consistency between the job graph loaded from the file and the one in memory.
zhuzhurk
reviewed
May 23, 2024
...e/src/main/java/org/apache/flink/runtime/scheduler/adaptivebatch/AdaptiveBatchScheduler.java
Outdated
Show resolved
Hide resolved
...e/src/main/java/org/apache/flink/runtime/scheduler/adaptivebatch/AdaptiveBatchScheduler.java
Outdated
Show resolved
Hide resolved
...in/java/org/apache/flink/runtime/scheduler/adaptivebatch/DefaultBatchJobRecoveryHandler.java
Outdated
Show resolved
Hide resolved
...in/java/org/apache/flink/runtime/scheduler/adaptivebatch/DefaultBatchJobRecoveryHandler.java
Show resolved
Hide resolved
...in/java/org/apache/flink/runtime/scheduler/adaptivebatch/DefaultBatchJobRecoveryHandler.java
Outdated
Show resolved
Hide resolved
...in/java/org/apache/flink/runtime/scheduler/adaptivebatch/DefaultBatchJobRecoveryHandler.java
Outdated
Show resolved
Hide resolved
...in/java/org/apache/flink/runtime/scheduler/adaptivebatch/DefaultBatchJobRecoveryHandler.java
Outdated
Show resolved
Hide resolved
zhuzhurk
reviewed
May 24, 2024
...e/src/main/java/org/apache/flink/runtime/scheduler/adaptivebatch/AdaptiveBatchScheduler.java
Outdated
Show resolved
Hide resolved
flink-runtime/src/main/java/org/apache/flink/runtime/jobmaster/JobMaster.java
Show resolved
Hide resolved
flink-tests/src/test/java/org/apache/flink/test/scheduling/JMFailoverITCase.java
Outdated
Show resolved
Hide resolved
flink-tests/src/test/java/org/apache/flink/test/scheduling/JMFailoverITCase.java
Outdated
Show resolved
Hide resolved
flink-tests/src/test/java/org/apache/flink/test/scheduling/JMFailoverITCase.java
Outdated
Show resolved
Hide resolved
flink-tests/src/test/java/org/apache/flink/test/scheduling/JMFailoverITCase.java
Outdated
Show resolved
Hide resolved
flink-tests/src/test/java/org/apache/flink/test/scheduling/JMFailoverITCase.java
Outdated
Show resolved
Hide resolved
flink-tests/src/test/java/org/apache/flink/test/scheduling/JMFailoverITCase.java
Outdated
Show resolved
Hide resolved
flink-tests/src/test/java/org/apache/flink/test/scheduling/JMFailoverITCase.java
Outdated
Show resolved
Hide resolved
flink-tests/src/test/java/org/apache/flink/test/scheduling/JMFailoverITCase.java
Outdated
Show resolved
Hide resolved
…etrics on TaskManagers during job recovery.
zhuzhurk
reviewed
May 24, 2024
...ime/src/test/java/org/apache/flink/runtime/scheduler/adaptivebatch/BatchJobRecoveryTest.java
Outdated
Show resolved
Hide resolved
...ime/src/test/java/org/apache/flink/runtime/scheduler/adaptivebatch/BatchJobRecoveryTest.java
Outdated
Show resolved
Hide resolved
zhuzhurk
reviewed
May 24, 2024
flink-tests/src/test/java/org/apache/flink/test/scheduling/JMFailoverITCase.java
Outdated
Show resolved
Hide resolved
JunRuiLee
force-pushed
the
jm_fo_main
branch
2 times, most recently
from
May 24, 2024 09:41
5e2ba9b
to
eaffd59
Compare
zhuzhurk
reviewed
May 24, 2024
flink-tests/src/test/java/org/apache/flink/test/scheduling/JMFailoverITCase.java
Outdated
Show resolved
Hide resolved
flink-tests/src/test/java/org/apache/flink/test/scheduling/JMFailoverITCase.java
Outdated
Show resolved
Hide resolved
flink-tests/src/test/java/org/apache/flink/test/scheduling/JMFailoverITCase.java
Outdated
Show resolved
Hide resolved
...ime/src/test/java/org/apache/flink/runtime/scheduler/adaptivebatch/BatchJobRecoveryTest.java
Outdated
Show resolved
Hide resolved
...ime/src/test/java/org/apache/flink/runtime/scheduler/adaptivebatch/BatchJobRecoveryTest.java
Outdated
Show resolved
Hide resolved
...ime/src/test/java/org/apache/flink/runtime/scheduler/adaptivebatch/BatchJobRecoveryTest.java
Outdated
Show resolved
Hide resolved
...ime/src/test/java/org/apache/flink/runtime/scheduler/adaptivebatch/BatchJobRecoveryTest.java
Outdated
Show resolved
Hide resolved
...ime/src/test/java/org/apache/flink/runtime/scheduler/adaptivebatch/BatchJobRecoveryTest.java
Outdated
Show resolved
Hide resolved
Thanks @zhuzhurk for the thorough review. I have refactored the BatchJobRecoveryTest and JMFailoverITCase based on your comments. PTAL. |
zhuzhurk
reviewed
May 27, 2024
...ime/src/test/java/org/apache/flink/runtime/scheduler/adaptivebatch/BatchJobRecoveryTest.java
Outdated
Show resolved
Hide resolved
...ime/src/test/java/org/apache/flink/runtime/scheduler/adaptivebatch/BatchJobRecoveryTest.java
Outdated
Show resolved
Hide resolved
...ime/src/test/java/org/apache/flink/runtime/scheduler/adaptivebatch/BatchJobRecoveryTest.java
Outdated
Show resolved
Hide resolved
...ime/src/test/java/org/apache/flink/runtime/scheduler/adaptivebatch/BatchJobRecoveryTest.java
Outdated
Show resolved
Hide resolved
...ime/src/test/java/org/apache/flink/runtime/scheduler/adaptivebatch/BatchJobRecoveryTest.java
Outdated
Show resolved
Hide resolved
...ime/src/test/java/org/apache/flink/runtime/scheduler/adaptivebatch/BatchJobRecoveryTest.java
Outdated
Show resolved
Hide resolved
...ime/src/test/java/org/apache/flink/runtime/scheduler/adaptivebatch/BatchJobRecoveryTest.java
Outdated
Show resolved
Hide resolved
...ime/src/test/java/org/apache/flink/runtime/scheduler/adaptivebatch/BatchJobRecoveryTest.java
Outdated
Show resolved
Hide resolved
...ime/src/test/java/org/apache/flink/runtime/scheduler/adaptivebatch/BatchJobRecoveryTest.java
Show resolved
Hide resolved
...ime/src/test/java/org/apache/flink/runtime/scheduler/adaptivebatch/BatchJobRecoveryTest.java
Outdated
Show resolved
Hide resolved
zhuzhurk
reviewed
May 27, 2024
...ime/src/test/java/org/apache/flink/runtime/scheduler/adaptivebatch/BatchJobRecoveryTest.java
Outdated
Show resolved
Hide resolved
zhuzhurk
approved these changes
May 27, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for addressing all the comments. @JunRuiLee
LGTM.
… of batch jobs from JobMaster failures.
JunRuiLee
changed the title
[FLINK-33892][runtime] Support Job Recovery from JobMaster Failures for Batch Jobs.
[FLINK-35465][runtime] Introduce BatchJobRecoveryHandler for recovery of batch jobs from JobMaster failures.
May 27, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What is the purpose of the change
(For example: This pull request makes task deployment go through the blob server, rather than through RPC. That way we avoid re-transferring them on each deployment (during recovery).)
Brief change log
Support Job Recovery from JobMaster Failures for Batch Jobs.
Verifying this change
This change added tests and can be verified by BatchJobRecoveryTest and JMFailoverITCase.
Does this pull request potentially affect one of the following parts:
@Public(Evolving)
: (yes / no)Documentation