Repository: spark Updated Branches: refs/heads/branch-1.1 cf2f8071d -> 6d0af526c
[sql]use SparkSQLEnv.stop() in ShutdownHook Author: wangfei <[email protected]> Closes #1852 from scwf/patch-3 and squashes the following commits: ae28c29 [wangfei] use SparkSQLEnv.stop() in ShutdownHook (cherry picked from commit e83fdcd421d132812411eb805565b76f087f1bc0) Signed-off-by: Michael Armbrust <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/6d0af526 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/6d0af526 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/6d0af526 Branch: refs/heads/branch-1.1 Commit: 6d0af526cf3fccdd668adcc20407a72764affdd6 Parents: cf2f807 Author: wangfei <[email protected]> Authored: Mon Aug 11 20:10:13 2014 -0700 Committer: Michael Armbrust <[email protected]> Committed: Mon Aug 11 20:10:24 2014 -0700 ---------------------------------------------------------------------- .../org/apache/spark/sql/hive/thriftserver/HiveThriftServer2.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/6d0af526/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/HiveThriftServer2.scala ---------------------------------------------------------------------- diff --git a/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/HiveThriftServer2.scala b/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/HiveThriftServer2.scala index 6f7942a..cadf7aa 100644 --- a/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/HiveThriftServer2.scala +++ b/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/HiveThriftServer2.scala @@ -60,7 +60,7 @@ private[hive] object HiveThriftServer2 extends Logging { Runtime.getRuntime.addShutdownHook( new Thread() { override def run() { - SparkSQLEnv.sparkContext.stop() + SparkSQLEnv.stop() } } ) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
