diff options
| author | Cheng Lian <lian@databricks.com> | 2014-11-10 16:57:34 -0800 |
|---|---|---|
| committer | Michael Armbrust <michael@databricks.com> | 2014-11-10 16:57:34 -0800 |
| commit | b3ef06b757383754a9173e81e5179946b12c7922 (patch) | |
| tree | fdb7e8494f859fcf216e84ab6a1490355e29072c | |
| parent | 86b1bd0313832658070b22d5c01caab666546655 (diff) | |
| download | spark-b3ef06b757383754a9173e81e5179946b12c7922.tar.gz spark-b3ef06b757383754a9173e81e5179946b12c7922.tar.bz2 spark-b3ef06b757383754a9173e81e5179946b12c7922.zip | |
[SPARK-4308][SQL] Follow up of #3175 for branch 1.1
PR #3175 is for master branch only and can't be backported to branch 1.1 directly because Hive 0.13.1 support.
Author: Cheng Lian <lian@databricks.com>
Closes #3176 from liancheng/fix-op-state-for-1.1 and squashes the following commits:
8791d87 [Cheng Lian] This is a follow up of #3175 for branch 1.1
| -rw-r--r-- | sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/server/SparkSQLOperationManager.scala | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/server/SparkSQLOperationManager.scala b/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/server/SparkSQLOperationManager.scala index bd3f68d92d..b819d853ce 100644 --- a/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/server/SparkSQLOperationManager.scala +++ b/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/server/SparkSQLOperationManager.scala @@ -199,6 +199,7 @@ private[thriftserver] class SparkSQLOperationManager(hiveContext: HiveContext) // Actually do need to catch Throwable as some failures don't inherit from Exception and // HiveServer will silently swallow them. case e: Throwable => + setState(OperationState.ERROR) logError("Error executing query:",e) throw new HiveSQLException(e.toString) } |