Repository: flink Updated Branches: refs/heads/master e6fddbc3e -> ddf62b114
[FLINK-6787] Fix Job-/StoppableException extend FlinkException Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/ddf62b11 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/ddf62b11 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/ddf62b11 Branch: refs/heads/master Commit: ddf62b114d24284208774ef7a52c89728434afbb Parents: e6fddbc Author: zjureel <zjur...@gmail.com> Authored: Wed Aug 9 13:49:02 2017 +0800 Committer: Aljoscha Krettek <aljoscha.kret...@gmail.com> Committed: Thu Aug 31 11:37:37 2017 +0200 ---------------------------------------------------------------------- .../java/org/apache/flink/client/program/ClusterClient.java | 2 +- .../flink/client/program/ProgramMissingJobException.java | 8 +++++++- .../src/main/java/org/apache/flink/runtime/JobException.java | 4 +++- .../java/org/apache/flink/runtime/StoppingException.java | 4 +++- .../client/JobClientActorConnectionTimeoutException.java | 4 +++- .../client/JobClientActorRegistrationTimeoutException.java | 4 +++- .../client/JobClientActorSubmissionTimeoutException.java | 4 +++- .../apache/flink/runtime/client/JobExecutionException.java | 3 ++- .../apache/flink/runtime/jobmaster/JobManagerException.java | 4 +++- 9 files changed, 28 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/ddf62b11/flink-clients/src/main/java/org/apache/flink/client/program/ClusterClient.java ---------------------------------------------------------------------- diff --git a/flink-clients/src/main/java/org/apache/flink/client/program/ClusterClient.java b/flink-clients/src/main/java/org/apache/flink/client/program/ClusterClient.java index 7bc2655..c8a236e 100644 --- a/flink-clients/src/main/java/org/apache/flink/client/program/ClusterClient.java +++ b/flink-clients/src/main/java/org/apache/flink/client/program/ClusterClient.java @@ -382,7 +382,7 @@ public abstract class ClusterClient { // invoke main method prog.invokeInteractiveModeForExecution(); if (lastJobExecutionResult == null && factory.getLastEnvCreated() == null) { - throw new ProgramMissingJobException(); + throw new ProgramMissingJobException("The program didn't contain a Flink job."); } if (isDetached()) { // in detached mode, we execute the whole user code to extract the Flink job, afterwards we run it here http://git-wip-us.apache.org/repos/asf/flink/blob/ddf62b11/flink-clients/src/main/java/org/apache/flink/client/program/ProgramMissingJobException.java ---------------------------------------------------------------------- diff --git a/flink-clients/src/main/java/org/apache/flink/client/program/ProgramMissingJobException.java b/flink-clients/src/main/java/org/apache/flink/client/program/ProgramMissingJobException.java index 43d608b..c2b5717 100644 --- a/flink-clients/src/main/java/org/apache/flink/client/program/ProgramMissingJobException.java +++ b/flink-clients/src/main/java/org/apache/flink/client/program/ProgramMissingJobException.java @@ -18,12 +18,18 @@ package org.apache.flink.client.program; +import org.apache.flink.util.FlinkException; + /** * Exception used to indicate that no job was executed during the invocation of a Flink program. */ -public class ProgramMissingJobException extends Exception { +public class ProgramMissingJobException extends FlinkException { /** * Serial version UID for serialization interoperability. */ private static final long serialVersionUID = -1964276369605091101L; + + public ProgramMissingJobException(String message) { + super(message); + } } http://git-wip-us.apache.org/repos/asf/flink/blob/ddf62b11/flink-runtime/src/main/java/org/apache/flink/runtime/JobException.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/JobException.java b/flink-runtime/src/main/java/org/apache/flink/runtime/JobException.java index d5a5bb9..d923af9 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/JobException.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/JobException.java @@ -18,10 +18,12 @@ package org.apache.flink.runtime; +import org.apache.flink.util.FlinkException; + /** * Indicates that a job has failed. */ -public class JobException extends Exception { +public class JobException extends FlinkException { private static final long serialVersionUID = 1275864691743020176L; http://git-wip-us.apache.org/repos/asf/flink/blob/ddf62b11/flink-runtime/src/main/java/org/apache/flink/runtime/StoppingException.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/StoppingException.java b/flink-runtime/src/main/java/org/apache/flink/runtime/StoppingException.java index 6bb71ce..3644219 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/StoppingException.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/StoppingException.java @@ -18,10 +18,12 @@ package org.apache.flink.runtime; +import org.apache.flink.util.FlinkException; + /** * Indicates that a job is not stoppable. */ -public class StoppingException extends Exception { +public class StoppingException extends FlinkException { private static final long serialVersionUID = -721315728140810694L; http://git-wip-us.apache.org/repos/asf/flink/blob/ddf62b11/flink-runtime/src/main/java/org/apache/flink/runtime/client/JobClientActorConnectionTimeoutException.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/client/JobClientActorConnectionTimeoutException.java b/flink-runtime/src/main/java/org/apache/flink/runtime/client/JobClientActorConnectionTimeoutException.java index 72a5658..74a4e1f 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/client/JobClientActorConnectionTimeoutException.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/client/JobClientActorConnectionTimeoutException.java @@ -18,11 +18,13 @@ package org.apache.flink.runtime.client; +import org.apache.flink.util.FlinkException; + /** * Exception which is thrown when the {@link JobClientActor} wants to submit a job to * the job manager but has not found one after a given timeout interval. */ -public class JobClientActorConnectionTimeoutException extends Exception { +public class JobClientActorConnectionTimeoutException extends FlinkException { private static final long serialVersionUID = 2287747430528388637L; public JobClientActorConnectionTimeoutException(String msg) { http://git-wip-us.apache.org/repos/asf/flink/blob/ddf62b11/flink-runtime/src/main/java/org/apache/flink/runtime/client/JobClientActorRegistrationTimeoutException.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/client/JobClientActorRegistrationTimeoutException.java b/flink-runtime/src/main/java/org/apache/flink/runtime/client/JobClientActorRegistrationTimeoutException.java index e57d1b4..499c9e4 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/client/JobClientActorRegistrationTimeoutException.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/client/JobClientActorRegistrationTimeoutException.java @@ -18,11 +18,13 @@ package org.apache.flink.runtime.client; +import org.apache.flink.util.FlinkException; + /** * Exception which is thrown by the {@link JobClientActor} if it has not heard back from the job * manager after it has attempted to register for a job within a given timeout interval. */ -public class JobClientActorRegistrationTimeoutException extends Exception { +public class JobClientActorRegistrationTimeoutException extends FlinkException { private static final long serialVersionUID = 8762463142030454853L; public JobClientActorRegistrationTimeoutException(String msg) { http://git-wip-us.apache.org/repos/asf/flink/blob/ddf62b11/flink-runtime/src/main/java/org/apache/flink/runtime/client/JobClientActorSubmissionTimeoutException.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/client/JobClientActorSubmissionTimeoutException.java b/flink-runtime/src/main/java/org/apache/flink/runtime/client/JobClientActorSubmissionTimeoutException.java index 2d39462..a56e389 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/client/JobClientActorSubmissionTimeoutException.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/client/JobClientActorSubmissionTimeoutException.java @@ -18,11 +18,13 @@ package org.apache.flink.runtime.client; +import org.apache.flink.util.FlinkException; + /** * Exception which is thrown by the {@link JobClientActor} if it has not heard back from the job * manager after it has submitted a job to it within a given timeout interval. */ -public class JobClientActorSubmissionTimeoutException extends Exception { +public class JobClientActorSubmissionTimeoutException extends FlinkException { private static final long serialVersionUID = 8762463142030454853L; public JobClientActorSubmissionTimeoutException(String msg) { http://git-wip-us.apache.org/repos/asf/flink/blob/ddf62b11/flink-runtime/src/main/java/org/apache/flink/runtime/client/JobExecutionException.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/client/JobExecutionException.java b/flink-runtime/src/main/java/org/apache/flink/runtime/client/JobExecutionException.java index 7c6a4af..47eaaf5 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/client/JobExecutionException.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/client/JobExecutionException.java @@ -19,13 +19,14 @@ package org.apache.flink.runtime.client; import org.apache.flink.api.common.JobID; +import org.apache.flink.util.FlinkException; /** * This exception is the base exception for all exceptions that denote any failure during * the execution of a job. The JobExecutionException and its subclasses are thrown by * the {@link JobClient}. */ -public class JobExecutionException extends Exception { +public class JobExecutionException extends FlinkException { private static final long serialVersionUID = 2818087325120827525L; http://git-wip-us.apache.org/repos/asf/flink/blob/ddf62b11/flink-runtime/src/main/java/org/apache/flink/runtime/jobmaster/JobManagerException.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmaster/JobManagerException.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmaster/JobManagerException.java index bc2759d..1650c83 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmaster/JobManagerException.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmaster/JobManagerException.java @@ -18,10 +18,12 @@ package org.apache.flink.runtime.jobmaster; +import org.apache.flink.util.FlinkException; + /** * Base exception thrown by the {@link JobMaster}. */ -public class JobManagerException extends Exception { +public class JobManagerException extends FlinkException { private static final long serialVersionUID = -7290962952242188064L;
