-
Notifications
You must be signed in to change notification settings - Fork 29k
[SPARK-32256][SQL][test-hadoop2.7] Force to initialize Hadoop VersionInfo in HiveExternalCatalog #29059
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Closed
[SPARK-32256][SQL][test-hadoop2.7] Force to initialize Hadoop VersionInfo in HiveExternalCatalog #29059
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
72 changes: 72 additions & 0 deletions
72
sql/hive/src/test/scala/org/apache/spark/sql/hive/client/HadoopVersionInfoSuite.scala
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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) | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ah i see