You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by ma...@apache.org on 2014/08/18 03:10:54 UTC
git commit: Revert "[SPARK-2970] [SQL] spark-sql script ends with
IOException when EventLogging is enabled"
Repository: spark
Updated Branches:
refs/heads/master 318e28b50 -> 5ecb08ea0
Revert "[SPARK-2970] [SQL] spark-sql script ends with IOException when EventLogging is enabled"
Revert #1891 due to issues with hadoop 1 compatibility.
Author: Michael Armbrust <mi...@databricks.com>
Closes #2007 from marmbrus/revert1891 and squashes the following commits:
68706c0 [Michael Armbrust] Revert "[SPARK-2970] [SQL] spark-sql script ends with IOException when EventLogging is enabled"
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/5ecb08ea
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/5ecb08ea
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/5ecb08ea
Branch: refs/heads/master
Commit: 5ecb08ea063166564178885b7515abef0d76eecb
Parents: 318e28b
Author: Michael Armbrust <mi...@databricks.com>
Authored: Sun Aug 17 18:10:45 2014 -0700
Committer: Michael Armbrust <mi...@databricks.com>
Committed: Sun Aug 17 18:10:45 2014 -0700
----------------------------------------------------------------------
.../spark/sql/hive/thriftserver/SparkSQLCLIDriver.scala | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/5ecb08ea/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/SparkSQLCLIDriver.scala
----------------------------------------------------------------------
diff --git a/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/SparkSQLCLIDriver.scala b/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/SparkSQLCLIDriver.scala
index c16a7d3..b092f42 100755
--- a/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/SparkSQLCLIDriver.scala
+++ b/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/SparkSQLCLIDriver.scala
@@ -26,8 +26,6 @@ import jline.{ConsoleReader, History}
import org.apache.commons.lang.StringUtils
import org.apache.commons.logging.LogFactory
import org.apache.hadoop.conf.Configuration
-import org.apache.hadoop.fs.FileSystem
-import org.apache.hadoop.util.ShutdownHookManager
import org.apache.hadoop.hive.cli.{CliDriver, CliSessionState, OptionsProcessor}
import org.apache.hadoop.hive.common.LogUtils.LogInitializationException
import org.apache.hadoop.hive.common.{HiveInterruptCallback, HiveInterruptUtils, LogUtils}
@@ -118,17 +116,13 @@ private[hive] object SparkSQLCLIDriver {
SessionState.start(sessionState)
// Clean up after we exit
- /**
- * This should be executed before shutdown hook of
- * FileSystem to avoid race condition of FileSystem operation
- */
- ShutdownHookManager.get.addShutdownHook(
+ Runtime.getRuntime.addShutdownHook(
new Thread() {
override def run() {
SparkSQLEnv.stop()
}
}
- , FileSystem.SHUTDOWN_HOOK_PRIORITY - 1)
+ )
// "-h" option has been passed, so connect to Hive thrift server.
if (sessionState.getHost != null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org