You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by sr...@apache.org on 2018/05/22 13:21:02 UTC
spark git commit: [SPARK-20120][SQL][FOLLOW-UP] Better way to support
spark-sql silent mode.
Repository: spark
Updated Branches:
refs/heads/master d3d180731 -> fc743f7b3
[SPARK-20120][SQL][FOLLOW-UP] Better way to support spark-sql silent mode.
## What changes were proposed in this pull request?
`spark-sql` silent mode will broken if`SPARK_HOME/jars` missing `kubernetes-model-2.0.0.jar`.
This pr use `sc.setLogLevel (<logLevel>)` to implement silent mode.
## How was this patch tested?
manual tests
```
build/sbt -Phive -Phive-thriftserver package
export SPARK_PREPEND_CLASSES=true
./bin/spark-sql -S
```
Author: Yuming Wang <yu...@ebay.com>
Closes #20274 from wangyum/SPARK-20120-FOLLOW-UP.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/fc743f7b
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/fc743f7b
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/fc743f7b
Branch: refs/heads/master
Commit: fc743f7b30902bad1da36131087bb922c17a048e
Parents: d3d1807
Author: Yuming Wang <yu...@ebay.com>
Authored: Tue May 22 08:20:59 2018 -0500
Committer: Sean Owen <sr...@gmail.com>
Committed: Tue May 22 08:20:59 2018 -0500
----------------------------------------------------------------------
.../spark/sql/hive/thriftserver/SparkSQLCLIDriver.scala | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/fc743f7b/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 084f820..d9fd3eb 100644
--- 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
@@ -35,7 +35,7 @@ import org.apache.hadoop.hive.ql.exec.Utilities
import org.apache.hadoop.hive.ql.processors._
import org.apache.hadoop.hive.ql.session.SessionState
import org.apache.hadoop.security.{Credentials, UserGroupInformation}
-import org.apache.log4j.{Level, Logger}
+import org.apache.log4j.Level
import org.apache.thrift.transport.TSocket
import org.apache.spark.SparkConf
@@ -300,10 +300,6 @@ private[hive] class SparkSQLCLIDriver extends CliDriver with Logging {
private val console = new SessionState.LogHelper(LOG)
- if (sessionState.getIsSilent) {
- Logger.getRootLogger.setLevel(Level.WARN)
- }
-
private val isRemoteMode = {
SparkSQLCLIDriver.isRemoteMode(sessionState)
}
@@ -315,6 +311,9 @@ private[hive] class SparkSQLCLIDriver extends CliDriver with Logging {
// because the Hive unit tests do not go through the main() code path.
if (!isRemoteMode) {
SparkSQLEnv.init()
+ if (sessionState.getIsSilent) {
+ SparkSQLEnv.sparkContext.setLogLevel(Level.WARN.toString)
+ }
} else {
// Hive 1.2 + not supported in CLI
throw new RuntimeException("Remote operations not supported")
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org