hvanhovell commented on code in PR #48120:
URL: https://github.com/apache/spark/pull/48120#discussion_r1838142495
##########
sql/core/src/main/scala/org/apache/spark/sql/artifact/ArtifactManager.scala:
##########
@@ -68,18 +69,43 @@ class ArtifactManager(session: SparkSession) extends
Logging {
s"$artifactRootURI${File.separator}${session.sessionUUID}")
// The base directory/URI where all class file artifacts are stored for this
`sessionUUID`.
- protected[artifact] val (classDir, classURI): (Path, String) =
+ protected[artifact] val (classDir, replClassURI): (Path, String) =
(ArtifactUtils.concatenatePaths(artifactPath, "classes"),
s"$artifactURI${File.separator}classes${File.separator}")
- protected[artifact] val state: JobArtifactState =
- JobArtifactState(session.sessionUUID, Option(classURI))
+ private lazy val alwaysApplyClassLoader =
+
session.conf.get(SQLConf.ARTIFACTS_SESSION_ISOLATION_ALWAYS_APPLY_CLASSLOADER.key).toBoolean
- def withResources[T](f: => T): T = {
- Utils.withContextClassLoader(classloader) {
- JobArtifactSet.withActiveJobArtifactState(state) {
+ private lazy val sessionIsolated =
+ session.conf.get(SQLConf.ARTIFACTS_SESSION_ISOLATION_ENABLED.key).toBoolean
+
+ protected[sql] lazy val state: JobArtifactState =
+ if (sessionIsolated) JobArtifactState(session.sessionUUID,
Some(replClassURI)) else null
+
+ /**
+ * Whether any artifact has been added to this artifact manager. We use this
to determine whether
+ * we should apply the classloader to the session, see
`withClassLoaderIfNeeded`.
+ */
+ protected val sessionArtifactAdded = new AtomicBoolean(false)
+
+ private def withClassLoaderIfNeeded[T](f: => T): T = {
+ val log = s" classloader for session ${session.sessionUUID} because " +
+ s"alwaysApplyClassLoader=$alwaysApplyClassLoader, " +
+ s"sessionArtifactAdded=${sessionArtifactAdded.get()}."
+ if (alwaysApplyClassLoader || sessionArtifactAdded.get()) {
+ logDebug(s"Applying $log")
Review Comment:
Is this ok to do with the new logging infra?
--
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.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
