You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by va...@apache.org on 2015/10/18 01:42:16 UTC
spark git commit: [SPARK-11000] [YARN] Load `metadata.Hive` class
only when `hive.metastore.uris` was set to avoid bootting the database twice
Repository: spark
Updated Branches:
refs/heads/master 022a8f6a1 -> e2dfdbb2c
[SPARK-11000] [YARN] Load `metadata.Hive` class only when `hive.metastore.uris` was set to avoid bootting the database twice
Author: huangzhaowei <ca...@gmail.com>
Closes #9026 from SaintBacchus/SPARK-11000.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/e2dfdbb2
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/e2dfdbb2
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/e2dfdbb2
Branch: refs/heads/master
Commit: e2dfdbb2c0523517880138f214775f9a896f2271
Parents: 022a8f6
Author: huangzhaowei <ca...@gmail.com>
Authored: Sat Oct 17 16:41:49 2015 -0700
Committer: Marcelo Vanzin <va...@cloudera.com>
Committed: Sat Oct 17 16:41:52 2015 -0700
----------------------------------------------------------------------
.../src/main/scala/org/apache/spark/deploy/yarn/Client.scala | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/e2dfdbb2/yarn/src/main/scala/org/apache/spark/deploy/yarn/Client.scala
----------------------------------------------------------------------
diff --git a/yarn/src/main/scala/org/apache/spark/deploy/yarn/Client.scala b/yarn/src/main/scala/org/apache/spark/deploy/yarn/Client.scala
index 9fcfe36..08aecfa 100644
--- a/yarn/src/main/scala/org/apache/spark/deploy/yarn/Client.scala
+++ b/yarn/src/main/scala/org/apache/spark/deploy/yarn/Client.scala
@@ -1327,11 +1327,8 @@ object Client extends Logging {
val mirror = universe.runtimeMirror(getClass.getClassLoader)
try {
- val hiveClass = mirror.classLoader.loadClass("org.apache.hadoop.hive.ql.metadata.Hive")
- val hive = hiveClass.getMethod("get").invoke(null)
-
- val hiveConf = hiveClass.getMethod("getConf").invoke(hive)
val hiveConfClass = mirror.classLoader.loadClass("org.apache.hadoop.hive.conf.HiveConf")
+ val hiveConf = hiveConfClass.newInstance()
val hiveConfGet = (param: String) => Option(hiveConfClass
.getMethod("get", classOf[java.lang.String])
@@ -1341,6 +1338,9 @@ object Client extends Logging {
// Check for local metastore
if (metastore_uri != None && metastore_uri.get.toString.size > 0) {
+ val hiveClass = mirror.classLoader.loadClass("org.apache.hadoop.hive.ql.metadata.Hive")
+ val hive = hiveClass.getMethod("get").invoke(null, hiveConf.asInstanceOf[Object])
+
val metastore_kerberos_principal_conf_var = mirror.classLoader
.loadClass("org.apache.hadoop.hive.conf.HiveConf$ConfVars")
.getField("METASTORE_KERBEROS_PRINCIPAL").get("varname").toString
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org