[hotfix] Fix invalid timeout in JobClient

VonRosenchild · Apr 14, 2015 · 56e9f1a · 56e9f1a
1 parent 51a583a
commit 56e9f1a
Showing 1 changed file with 3 additions and 2 deletions.
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
@@ -140,7 +140,7 @@ public static SerializedJobExecutionResult submitJobAndWait(ActorSystem actorSys
  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 static SerializedJobExecutionResult submitJobAndWait(ActorSystem actorSys
  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(),