Repository: flink Updated Branches: refs/heads/master 51a583adb -> 56e9f1a84
[hotfix] Fix invalid timeout in JobClient Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/56e9f1a8 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/56e9f1a8 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/56e9f1a8 Branch: refs/heads/master Commit: 56e9f1a845e3efdb3bd27302ae0cd8dce61fd005 Parents: 51a583a Author: Stephan Ewen <se...@apache.org> Authored: Wed Apr 15 00:38:39 2015 +0200 Committer: Stephan Ewen <se...@apache.org> Committed: Wed Apr 15 00:38:39 2015 +0200 ---------------------------------------------------------------------- .../main/java/org/apache/flink/runtime/client/JobClient.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/56e9f1a8/flink-runtime/src/main/java/org/apache/flink/runtime/client/JobClient.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/client/JobClient.java b/flink-runtime/src/main/java/org/apache/flink/runtime/client/JobClient.java index aa03491..72f39d6 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/client/JobClient.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/client/JobClient.java @@ -140,7 +140,7 @@ public class JobClient { new JobClientMessages.SubmitJobAndWait(jobGraph), new Timeout(AkkaUtils.INF_TIMEOUT())); - Object answer = Await.result(future, timeout); + Object answer = Await.result(future, AkkaUtils.INF_TIMEOUT()); if (answer instanceof JobManagerMessages.JobResultSuccess) { LOG.info("Job execution complete"); @@ -161,7 +161,8 @@ public class JobClient { throw e; } catch (TimeoutException e) { - throw new JobTimeoutException(jobGraph.getJobID(), "Lost connection to JobManager", e); + throw new JobTimeoutException(jobGraph.getJobID(), "Timeout while waiting for JobManager answer. " + + "Job time exceeded " + AkkaUtils.INF_TIMEOUT(), e); } catch (Throwable t) { throw new JobExecutionException(jobGraph.getJobID(),
