commit 626a21767305069019a798261b8999b8618c0a44 Author: Sahil Takiar Date: Wed Oct 18 18:06:42 2017 -0700 HIVE-17837: Explicitly check if the HoS Remote Driver has been lost in the RemoteSparkJobMonitor diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/spark/status/RemoteSparkJobMonitor.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/spark/status/RemoteSparkJobMonitor.java index 6c7aca7be8..b624432333 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/spark/status/RemoteSparkJobMonitor.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/spark/status/RemoteSparkJobMonitor.java @@ -66,6 +66,7 @@ public int startMonitor() { while (true) { try { JobHandle.State state = sparkJobStatus.getRemoteJobState(); + Preconditions.checkState(sparkJobStatus.isRemoteActive(), "Connection to remote Spark driver was lost"); switch (state) { case SENT: @@ -133,10 +134,6 @@ public int startMonitor() { printStatus(progressMap, lastProgressMap); lastProgressMap = progressMap; - } else if (sparkJobState == null) { - // in case the remote context crashes between JobStarted and JobSubmitted - Preconditions.checkState(sparkJobStatus.isRemoteActive(), - "Remote context becomes inactive."); } break; case SUCCEEDED: