[SPARK-44246][CONNECT][FOLLOW-UP] Miscellaneous cleanups for Spark Connect Jar/Classfile Isolation #41789
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
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
Binary file not shown.
Binary file not shown.
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,102 @@ | ||
| /* | ||
| * 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.executor | ||
|
|
||
| import org.apache.spark.{JobArtifactSet, LocalSparkContext, SparkConf, SparkContext, SparkFunSuite} | ||
| import org.apache.spark.util.Utils | ||
|
|
||
| class ClassLoaderIsolationSuite extends SparkFunSuite with LocalSparkContext { | ||
|
Contributor
There was a problem hiding this comment. @vicennial The new test failed with Scala 2.13: 
Contributor
There was a problem hiding this comment. Perhaps we should upload both
Sorry, I found the source code in commnets |
||
| val jar1 = Thread.currentThread().getContextClassLoader.getResource("TestUDTF.jar").toString | ||
|
|
||
| // package com.example | ||
| // object Hello { def test(): Int = 2 } | ||
| // case class Hello(x: Int, y: Int) | ||
| val jar2 = Thread.currentThread().getContextClassLoader.getResource("TestHelloV2.jar").toString | ||
|
|
||
| // package com.example | ||
| // object Hello { def test(): Int = 3 } | ||
| // case class Hello(x: String) | ||
| val jar3 = Thread.currentThread().getContextClassLoader.getResource("TestHelloV3.jar").toString | ||
|
|
||
| test("Executor classloader isolation with JobArtifactSet") { | ||
| sc = new SparkContext(new SparkConf().setAppName("test").setMaster("local")) | ||
| sc.addJar(jar1) | ||
| sc.addJar(jar2) | ||
| sc.addJar(jar3) | ||
|
|
||
| // TestHelloV2's test method returns '2' | ||
| val artifactSetWithHelloV2 = new JobArtifactSet( | ||
| uuid = Some("hello2"), | ||
| replClassDirUri = None, | ||
| jars = Map(jar2 -> 1L), | ||
| files = Map.empty, | ||
| archives = Map.empty | ||
| ) | ||
|
|
||
| JobArtifactSet.withActive(artifactSetWithHelloV2) { | ||
| sc.parallelize(1 to 1).foreach { i => | ||
| val cls = Utils.classForName("com.example.Hello$") | ||
| val module = cls.getField("MODULE$").get(null) | ||
| val result = cls.getMethod("test").invoke(module).asInstanceOf[Int] | ||
| if (result != 2) { | ||
| throw new RuntimeException("Unexpected result: " + result) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // TestHelloV3's test method returns '3' | ||
| val artifactSetWithHelloV3 = new JobArtifactSet( | ||
| uuid = Some("hello3"), | ||
| replClassDirUri = None, | ||
| jars = Map(jar3 -> 1L), | ||
| files = Map.empty, | ||
| archives = Map.empty | ||
| ) | ||
|
|
||
| JobArtifactSet.withActive(artifactSetWithHelloV3) { | ||
| sc.parallelize(1 to 1).foreach { i => | ||
| val cls = Utils.classForName("com.example.Hello$") | ||
| val module = cls.getField("MODULE$").get(null) | ||
| val result = cls.getMethod("test").invoke(module).asInstanceOf[Int] | ||
| if (result != 3) { | ||
| throw new RuntimeException("Unexpected result: " + result) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // Should not be able to see any "Hello" class if they're excluded from the artifact set | ||
| val artifactSetWithoutHello = new JobArtifactSet( | ||
| uuid = Some("Jar 1"), | ||
| replClassDirUri = None, | ||
| jars = Map(jar1 -> 1L), | ||
| files = Map.empty, | ||
| archives = Map.empty | ||
| ) | ||
|
|
||
| JobArtifactSet.withActive(artifactSetWithoutHello) { | ||
| sc.parallelize(1 to 1).foreach { i => | ||
| try { | ||
| Utils.classForName("com.example.Hello$") | ||
| throw new RuntimeException("Import should fail") | ||
| } catch { | ||
| case _: ClassNotFoundException => | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
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.
@HyukjinKwon With directly fetching the Python Includes, I've removed the
private lazy val pythonIncludesandSessionHolder#withSessionBasedPythonPathssince we don't need to propagate them via confs anymoreThere 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.
Gotya. This is exactly the change I planned to made this week :-). Thank you for doing this here.