Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions project/SparkBuild.scala
Original file line number Diff line number Diff line change
Expand Up @@ -476,6 +476,7 @@ object SparkParallelTestGrouping {
"org.apache.spark.ml.classification.LogisticRegressionSuite",
"org.apache.spark.ml.classification.LinearSVCSuite",
"org.apache.spark.sql.SQLQueryTestSuite",
"org.apache.spark.sql.hive.client.HadoopVersionInfoSuite",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AFAIK this only works for SBT. Maybe we need to disable the test by default to avoid breaking the maven build.

cc @gengliangwang

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is fine. The test is not failing in maven build. In the maven build, it will still pass but won't be able to catch the issue.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah i see

"org.apache.spark.sql.hive.thriftserver.SparkExecuteStatementOperationSuite",
"org.apache.spark.sql.hive.thriftserver.ThriftServerQueryTestSuite",
"org.apache.spark.sql.hive.thriftserver.SparkSQLEnvSuite",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,10 @@ private[spark] class HiveExternalCatalog(conf: SparkConf, hadoopConf: Configurat
import HiveExternalCatalog._
import CatalogTableType._

// SPARK-32256: Make sure `VersionInfo` is initialized before touching the isolated classloader.
// This is to ensure Hive can get the Hadoop version when using the isolated classloader.
org.apache.hadoop.util.VersionInfo.getVersion()

/**
* A Hive client used to interact with the metastore.
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package org.apache.spark.sql.hive.client

import java.io.File
import java.net.URLClassLoader

import org.apache.hadoop.conf.Configuration

import org.apache.spark.{SparkConf, SparkFunSuite}
import org.apache.spark.sql.hive.{HiveExternalCatalog, HiveUtils}
import org.apache.spark.util.Utils

/**
* This test suite requires a clean JVM because it's testing the initialization of static codes in
* `org.apache.hadoop.util.VersionInfo`.
*/
class HadoopVersionInfoSuite extends SparkFunSuite {
override protected val enableAutoThreadAudit = false

test("SPARK-32256: Hadoop VersionInfo should be preloaded") {
val ivyPath =
Utils.createTempDir(namePrefix = s"${classOf[HadoopVersionInfoSuite].getSimpleName}-ivy")
try {
val hadoopConf = new Configuration()
hadoopConf.set("test", "success")
hadoopConf.set("datanucleus.schema.autoCreateAll", "true")
hadoopConf.set("hive.metastore.schema.verification", "false")

// Download jars for Hive 2.0
val client = IsolatedClientLoader.forVersion(
hiveMetastoreVersion = "2.0",
hadoopVersion = "2.7.4",
sparkConf = new SparkConf(),
hadoopConf = hadoopConf,
config = HiveClientBuilder.buildConf(Map.empty),
ivyPath = Some(ivyPath.getCanonicalPath),
sharesHadoopClasses = true)
val jars = client.classLoader.getParent.asInstanceOf[URLClassLoader].getURLs
.map(u => new File(u.toURI))
// Drop all Hadoop jars to use the existing Hadoop jars on the classpath
.filter(!_.getName.startsWith("org.apache.hadoop_hadoop-"))

val sparkConf = new SparkConf()
sparkConf.set(HiveUtils.HIVE_METASTORE_VERSION, "2.0")
sparkConf.set(
HiveUtils.HIVE_METASTORE_JARS,
jars.map(_.getCanonicalPath).mkString(File.pathSeparator))
HiveClientBuilder.buildConf(Map.empty).foreach { case (k, v) =>
hadoopConf.set(k, v)
}
new HiveExternalCatalog(sparkConf, hadoopConf).client.getState
} finally {
Utils.deleteRecursively(ivyPath)
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ private[client] object HiveClientBuilder {
Some(new File(sys.props("java.io.tmpdir"), "hive-ivy-cache").getAbsolutePath))
}

private def buildConf(extraConf: Map[String, String]) = {
private[client] def buildConf(extraConf: Map[String, String]): Map[String, String] = {
lazy val warehousePath = Utils.createTempDir()
lazy val metastorePath = Utils.createTempDir()
metastorePath.delete()
Expand Down