yaooqinn commented on a change in pull request #31460:
URL: https://github.com/apache/spark/pull/31460#discussion_r569548760
##########
File path: core/src/test/scala/org/apache/spark/SparkContextSuite.scala
##########
@@ -1151,6 +1150,39 @@ class SparkContextSuite extends SparkFunSuite with
LocalSparkContext with Eventu
assert(sc.listJars().exists(_.contains("org.apache.hive_hive-storage-api-2.7.0.jar")))
assert(sc.listJars().exists(_.contains("commons-lang_commons-lang-2.6.jar")))
}
+
+ test("SPARK-34346: hadoop configuration priority for spark/hive/hadoop
configs") {
+ val testKey = "hadoop.tmp.dir"
+ val bufferKey = "io.file.buffer.size"
+ val hadoopConf0 = new Configuration()
+
+ val hiveConfFile =
Utils.getContextOrSparkClassLoader.getResource("hive-site.xml")
+ assert(hiveConfFile != null)
+ hadoopConf0.addResource(hiveConfFile)
+ assert(hadoopConf0.get(testKey) === "/tmp/hive_one")
+ assert(hadoopConf0.get(bufferKey) === "201811")
+
+ val sparkConf = new SparkConf()
+ .setAppName("test")
+ .setMaster("local")
+ .set(BUFFER_SIZE, 65536)
+ sc = new SparkContext(sparkConf)
+ assert(sc.hadoopConfiguration.get(testKey) === "/tmp/hive_one",
+ "hive configs have higher priority than hadoop ones ")
+ assert(sc.hadoopConfiguration.get(bufferKey).toInt === 65536,
+ "spark configs have higher priority than hive ones")
+
+ resetSparkContext()
+
+ sparkConf
+ .set("spark.hadoop.hadoop.tmp.dir", "/tmp/hive_two")
+ .set(s"spark.hadoop.$bufferKey", "20181117")
+ sc = new SparkContext(sparkConf)
+ assert(sc.hadoopConfiguration.get(testKey) === "/tmp/hive_two",
+ "spark.hadoop configs have higher priority than hive/hadoop ones")
+ assert(sc.hadoopConfiguration.get(bufferKey).toInt === 65536,
Review comment:
here is the same sparkConf w/ two more configs，willnot change to respect
spark.hadoop.xxx
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
