Repository: hive Updated Branches: refs/heads/master 3c29f8ff5 -> 3a2d31778
HIVE-16348: HoS query is canceled but error message shows RPC is closed (Jimmy Xiang, reviewed by Xuefu Zhang) Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/3a2d3177 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/3a2d3177 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/3a2d3177 Branch: refs/heads/master Commit: 3a2d3177853714b31cadc2bfad2c9a63f4798899 Parents: 3c29f8f Author: Jimmy Xiang <jxi...@apache.org> Authored: Fri Mar 31 11:41:05 2017 -0700 Committer: Jimmy Xiang <jxi...@apache.org> Committed: Sat Apr 1 10:25:50 2017 -0700 ---------------------------------------------------------------------- .../hive/ql/exec/spark/status/impl/RemoteSparkJobStatus.java | 6 ++++++ 1 file changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/3a2d3177/ql/src/java/org/apache/hadoop/hive/ql/exec/spark/status/impl/RemoteSparkJobStatus.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/spark/status/impl/RemoteSparkJobStatus.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/spark/status/impl/RemoteSparkJobStatus.java index 951dbb4..67db303 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/spark/status/impl/RemoteSparkJobStatus.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/spark/status/impl/RemoteSparkJobStatus.java @@ -67,6 +67,9 @@ public class RemoteSparkJobStatus implements SparkJobStatus { return getAppID.get(sparkClientTimeoutInSeconds, TimeUnit.SECONDS); } catch (Exception e) { LOG.warn("Failed to get APP ID.", e); + if (Thread.interrupted()) { + error = e; + } return null; } } @@ -186,6 +189,9 @@ public class RemoteSparkJobStatus implements SparkJobStatus { } public JobHandle.State getRemoteJobState() { + if (error != null) { + return JobHandle.State.FAILED; + } return jobHandle.getState(); }