-
Notifications
You must be signed in to change notification settings - Fork 29.3k
[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
[SPARK-32256][SQL][test-hadoop2.7] Force to initialize Hadoop VersionInfo in HiveExternalCatalog #29059
Changes from 3 commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| /* | ||
| * 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} | ||
|
|
||
| /** | ||
| * 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 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 = HiveClientBuilder.ivyPath, | ||
|
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Just realized this will use the same ivy path as Let me use a temp directory instead and see how long it will take if we don't share the same ivy path. |
||
| 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 | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Thank you for making this test case, @zsxwing . So, does this artificial dropping mimic the situation?
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yep |
||
| .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 | ||
| } | ||
| } | ||
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