spark git commit: [SPARK-5696] [SQL] [HOTFIX] Asks HiveThriftServer2 to re-initialize log4j using Hive configurations
Repository: spark
Updated Branches:
refs/heads/branch-1.3 e24160142 - 379233cd0
[SPARK-5696] [SQL] [HOTFIX] Asks HiveThriftServer2 to re-initialize log4j using
Hive configurations
In this way, log4j configurations overriden by jets3t-0.9.2.jar can be again
overriden by Hive default log4j configurations.
This might not be the best solution for this issue since it requires users to
use `hive-log4j.properties` rather than `log4j.properties` to initialize
`HiveThriftServer2` logging configurations, which can be confusing. The main
purpose of this PR is to fix Jenkins PR build.
!-- Reviewable:start --
[img src=https://reviewable.io/review_button.png; height=40 alt=Review on
Reviewable/](https://reviewable.io/reviews/apache/spark/4484)
!-- Reviewable:end --
Author: Cheng Lian l...@databricks.com
Closes #4484 from liancheng/spark-5696 and squashes the following commits:
df83956 [Cheng Lian] Hot fix: asks HiveThriftServer2 to re-initialize log4j
using Hive configurations
(cherry picked from commit b8080aa86d55e0467fd4328f10a2f0d6605e6cc6)
Signed-off-by: Cheng Lian l...@databricks.com
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/379233cd
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/379233cd
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/379233cd
Branch: refs/heads/branch-1.3
Commit: 379233cd00d17c5c94d6f2cd57557b4fac8b1a66
Parents: e241601
Author: Cheng Lian l...@databricks.com
Authored: Mon Feb 9 16:23:12 2015 -0800
Committer: Cheng Lian l...@databricks.com
Committed: Mon Feb 9 16:23:28 2015 -0800
--
.../apache/spark/sql/hive/thriftserver/HiveThriftServer2.scala| 3 +++
1 file changed, 3 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/spark/blob/379233cd/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 6e07df1..525777a 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
@@ -18,6 +18,7 @@
package org.apache.spark.sql.hive.thriftserver
import org.apache.commons.logging.LogFactory
+import org.apache.hadoop.hive.common.LogUtils
import org.apache.hadoop.hive.conf.HiveConf
import org.apache.hadoop.hive.conf.HiveConf.ConfVars
import org.apache.hive.service.cli.thrift.{ThriftBinaryCLIService,
ThriftHttpCLIService}
@@ -54,6 +55,8 @@ object HiveThriftServer2 extends Logging {
System.exit(-1)
}
+LogUtils.initHiveLog4j()
+
logInfo(Starting SparkContext)
SparkSQLEnv.init()
-
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org
spark git commit: [SPARK-5696] [SQL] [HOTFIX] Asks HiveThriftServer2 to re-initialize log4j using Hive configurations
Repository: spark
Updated Branches:
refs/heads/master 5f0b30e59 - b8080aa86
[SPARK-5696] [SQL] [HOTFIX] Asks HiveThriftServer2 to re-initialize log4j using
Hive configurations
In this way, log4j configurations overriden by jets3t-0.9.2.jar can be again
overriden by Hive default log4j configurations.
This might not be the best solution for this issue since it requires users to
use `hive-log4j.properties` rather than `log4j.properties` to initialize
`HiveThriftServer2` logging configurations, which can be confusing. The main
purpose of this PR is to fix Jenkins PR build.
!-- Reviewable:start --
[img src=https://reviewable.io/review_button.png; height=40 alt=Review on
Reviewable/](https://reviewable.io/reviews/apache/spark/4484)
!-- Reviewable:end --
Author: Cheng Lian l...@databricks.com
Closes #4484 from liancheng/spark-5696 and squashes the following commits:
df83956 [Cheng Lian] Hot fix: asks HiveThriftServer2 to re-initialize log4j
using Hive configurations
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/b8080aa8
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/b8080aa8
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/b8080aa8
Branch: refs/heads/master
Commit: b8080aa86d55e0467fd4328f10a2f0d6605e6cc6
Parents: 5f0b30e
Author: Cheng Lian l...@databricks.com
Authored: Mon Feb 9 16:23:12 2015 -0800
Committer: Cheng Lian l...@databricks.com
Committed: Mon Feb 9 16:23:12 2015 -0800
--
.../apache/spark/sql/hive/thriftserver/HiveThriftServer2.scala| 3 +++
1 file changed, 3 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/spark/blob/b8080aa8/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 6e07df1..525777a 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
@@ -18,6 +18,7 @@
package org.apache.spark.sql.hive.thriftserver
import org.apache.commons.logging.LogFactory
+import org.apache.hadoop.hive.common.LogUtils
import org.apache.hadoop.hive.conf.HiveConf
import org.apache.hadoop.hive.conf.HiveConf.ConfVars
import org.apache.hive.service.cli.thrift.{ThriftBinaryCLIService,
ThriftHttpCLIService}
@@ -54,6 +55,8 @@ object HiveThriftServer2 extends Logging {
System.exit(-1)
}
+LogUtils.initHiveLog4j()
+
logInfo(Starting SparkContext)
SparkSQLEnv.init()
-
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org
