yanghua commented on a change in pull request #7571: [FLINK-10724] Refactor
failure handling in check point coordinator
URL: https://github.com/apache/flink/pull/7571#discussion_r250843033
##########
File path:
flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/PendingCheckpoint.java
##########
@@ -405,54 +404,21 @@ public void addMasterState(MasterState state) {
//
------------------------------------------------------------------------
/**
- * Aborts a checkpoint because it expired (took too long).
+ * Aborts a checkpoint with abort reason and cause.
*/
- public void abortExpired() {
+ public void abort(CheckpointAbortReason reason, Throwable cause) {
try {
- Exception cause = new Exception("Checkpoint expired
before completing");
- onCompletionPromise.completeExceptionally(cause);
- reportFailedCheckpoint(cause);
+ onCompletionPromise.complete(new
CheckpointExecuteResult(reason, cause));
+ reportFailedCheckpoint(new
Exception(reason.getMessage(), cause));
+ assertAbortSubsumedForced(reason);
} finally {
dispose(true);
}
}
- /**
- * Aborts the pending checkpoint because a newer completed checkpoint
subsumed it.
- */
- public void abortSubsumed() {
- try {
- Exception cause = new Exception("Checkpoints has been
subsumed");
- onCompletionPromise.completeExceptionally(cause);
- reportFailedCheckpoint(cause);
-
- if (props.forceCheckpoint()) {
- throw new IllegalStateException("Bug: forced
checkpoints must never be subsumed");
- }
- } finally {
- dispose(true);
- }
- }
-
-
- public void abortDeclined() {
- abortWithCause(new Exception("Checkpoint was declined (tasks
not ready)"));
- }
-
- /**
- * Aborts the pending checkpoint due to an error.
- * @param cause The error's exception.
- */
- public void abortError(@Nonnull Throwable cause) {
- abortWithCause(new Exception("Checkpoint failed: " +
cause.getMessage(), cause));
- }
-
- private void abortWithCause(@Nonnull Exception cause) {
- try {
- onCompletionPromise.completeExceptionally(cause);
- reportFailedCheckpoint(cause);
- } finally {
- dispose(true);
+ private void assertAbortSubsumedForced(CheckpointAbortReason reason) {
Review comment:
used
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
