This is an automated email from the ASF dual-hosted git repository.
wanghailin pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/seatunnel.git
The following commit(s) were added to refs/heads/dev by this push:
new d580860255 [Fix][Zeta] Fix thread classloader be set to null when use
cache mode (#6509)
d580860255 is described below
commit d58086025584f6c4232b9005dcb122185a435911
Author: Jia Fan <[email protected]>
AuthorDate: Fri Mar 15 10:07:39 2024 +0800
[Fix][Zeta] Fix thread classloader be set to null when use cache mode
(#6509)
---
.../engine/common/loader/ClassLoaderUtil.java | 35 ----------------------
.../classloader/DefaultClassLoaderService.java | 13 +++++++-
.../core/parse/MultipleTableJobConfigParser.java | 2 --
.../core/classloader/ClassLoaderServiceTest.java | 31 +++++++++++++++++++
.../engine/server/TaskExecutionService.java | 3 --
.../seatunnel/engine/server/master/JobMaster.java | 3 --
6 files changed, 43 insertions(+), 44 deletions(-)
diff --git
a/seatunnel-engine/seatunnel-engine-common/src/main/java/org/apache/seatunnel/engine/common/loader/ClassLoaderUtil.java
b/seatunnel-engine/seatunnel-engine-common/src/main/java/org/apache/seatunnel/engine/common/loader/ClassLoaderUtil.java
deleted file mode 100644
index cb6e0820f0..0000000000
---
a/seatunnel-engine/seatunnel-engine-common/src/main/java/org/apache/seatunnel/engine/common/loader/ClassLoaderUtil.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * 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.seatunnel.engine.common.loader;
-
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
-public class ClassLoaderUtil {
-
- public static void recycleClassLoaderFromThread(ClassLoader classLoader) {
- log.info("recycle classloader " + classLoader);
- Thread.getAllStackTraces().keySet().stream()
- .filter(thread -> thread.getContextClassLoader() ==
classLoader)
- .forEach(
- thread -> {
- log.info("recycle classloader for thread " +
thread.getName());
- thread.setContextClassLoader(null);
- });
- }
-}
diff --git
a/seatunnel-engine/seatunnel-engine-core/src/main/java/org/apache/seatunnel/engine/core/classloader/DefaultClassLoaderService.java
b/seatunnel-engine/seatunnel-engine-core/src/main/java/org/apache/seatunnel/engine/core/classloader/DefaultClassLoaderService.java
index 36c7ae2f02..c562829006 100644
---
a/seatunnel-engine/seatunnel-engine-core/src/main/java/org/apache/seatunnel/engine/core/classloader/DefaultClassLoaderService.java
+++
b/seatunnel-engine/seatunnel-engine-core/src/main/java/org/apache/seatunnel/engine/core/classloader/DefaultClassLoaderService.java
@@ -88,9 +88,10 @@ public class DefaultClassLoaderService implements
ClassLoaderService {
return;
}
if (referenceCount == 0) {
- classLoaderMap.remove(key);
+ ClassLoader classLoader = classLoaderMap.remove(key);
log.info("Release classloader for job {} with jars {}", jobId,
jars);
classLoaderReferenceCount.get(jobId).remove(key);
+ recycleClassLoaderFromThread(classLoader);
}
if (classLoaderMap.isEmpty()) {
classLoaderCache.remove(jobId);
@@ -98,6 +99,16 @@ public class DefaultClassLoaderService implements
ClassLoaderService {
}
}
+ private static void recycleClassLoaderFromThread(ClassLoader classLoader) {
+ Thread.getAllStackTraces().keySet().stream()
+ .filter(thread -> thread.getContextClassLoader() ==
classLoader)
+ .forEach(
+ thread -> {
+ log.info("recycle classloader for thread " +
thread.getName());
+ thread.setContextClassLoader(null);
+ });
+ }
+
private String covertJarsToKey(Collection<URL> jars) {
return jars.stream().map(URL::toString).sorted().reduce((a, b) -> a +
b).orElse("");
}
diff --git
a/seatunnel-engine/seatunnel-engine-core/src/main/java/org/apache/seatunnel/engine/core/parse/MultipleTableJobConfigParser.java
b/seatunnel-engine/seatunnel-engine-core/src/main/java/org/apache/seatunnel/engine/core/parse/MultipleTableJobConfigParser.java
index 395f8b4a1a..50e35d9117 100644
---
a/seatunnel-engine/seatunnel-engine-core/src/main/java/org/apache/seatunnel/engine/core/parse/MultipleTableJobConfigParser.java
+++
b/seatunnel-engine/seatunnel-engine-core/src/main/java/org/apache/seatunnel/engine/core/parse/MultipleTableJobConfigParser.java
@@ -46,7 +46,6 @@ import org.apache.seatunnel.core.starter.execution.PluginUtil;
import org.apache.seatunnel.core.starter.utils.ConfigBuilder;
import org.apache.seatunnel.engine.common.config.JobConfig;
import org.apache.seatunnel.engine.common.exception.JobDefineCheckException;
-import org.apache.seatunnel.engine.common.loader.ClassLoaderUtil;
import
org.apache.seatunnel.engine.common.loader.SeaTunnelChildFirstClassLoader;
import org.apache.seatunnel.engine.common.utils.IdGenerator;
import org.apache.seatunnel.engine.core.classloader.ClassLoaderService;
@@ -209,7 +208,6 @@ public class MultipleTableJobConfigParser {
classLoaderService.releaseClassLoader(
Long.parseLong(jobConfig.getJobContext().getJobId()),
connectorJars);
}
- ClassLoaderUtil.recycleClassLoaderFromThread(classLoader);
}
}
diff --git
a/seatunnel-engine/seatunnel-engine-core/src/test/java/org/apache/seatunnel/engine/core/classloader/ClassLoaderServiceTest.java
b/seatunnel-engine/seatunnel-engine-core/src/test/java/org/apache/seatunnel/engine/core/classloader/ClassLoaderServiceTest.java
index 0e2fe90af2..00a2445e58 100644
---
a/seatunnel-engine/seatunnel-engine-core/src/test/java/org/apache/seatunnel/engine/core/classloader/ClassLoaderServiceTest.java
+++
b/seatunnel-engine/seatunnel-engine-core/src/test/java/org/apache/seatunnel/engine/core/classloader/ClassLoaderServiceTest.java
@@ -69,4 +69,35 @@ public class ClassLoaderServiceTest extends
AbstractClassLoaderServiceTest {
Lists.newArrayList(new URL("file:///console.jar"), new
URL("file:///fake.jar")));
Assertions.assertEquals(0, classLoaderService.queryClassLoaderCount());
}
+
+ @Test
+ void testRecycleClassLoaderFromThread() throws MalformedURLException,
InterruptedException {
+ ClassLoader classLoader =
+ classLoaderService.getClassLoader(
+ 3L,
+ Lists.newArrayList(
+ new URL("file:///console.jar"), new
URL("file:///fake.jar")));
+ ClassLoader appClassLoader =
Thread.currentThread().getContextClassLoader();
+ Thread.currentThread().setContextClassLoader(classLoader);
+ Thread thread =
+ new Thread(
+ () -> {
+ while
(Thread.currentThread().getContextClassLoader() != null) {
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ });
+ thread.start();
+ Thread.currentThread().setContextClassLoader(appClassLoader);
+ Assertions.assertEquals(classLoader, thread.getContextClassLoader());
+ classLoaderService.releaseClassLoader(
+ 3L,
+ Lists.newArrayList(new URL("file:///console.jar"), new
URL("file:///fake.jar")));
+ Assertions.assertNull(thread.getContextClassLoader());
+ Thread.sleep(2000);
+ Assertions.assertFalse(thread.isAlive());
+ }
}
diff --git
a/seatunnel-engine/seatunnel-engine-server/src/main/java/org/apache/seatunnel/engine/server/TaskExecutionService.java
b/seatunnel-engine/seatunnel-engine-server/src/main/java/org/apache/seatunnel/engine/server/TaskExecutionService.java
index e4ff187bb2..197833903d 100644
---
a/seatunnel-engine/seatunnel-engine-server/src/main/java/org/apache/seatunnel/engine/server/TaskExecutionService.java
+++
b/seatunnel-engine/seatunnel-engine-server/src/main/java/org/apache/seatunnel/engine/server/TaskExecutionService.java
@@ -25,7 +25,6 @@ import
org.apache.seatunnel.engine.common.config.ConfigProvider;
import org.apache.seatunnel.engine.common.config.SeaTunnelConfig;
import org.apache.seatunnel.engine.common.config.server.ThreadShareMode;
import org.apache.seatunnel.engine.common.exception.JobNotFoundException;
-import org.apache.seatunnel.engine.common.loader.ClassLoaderUtil;
import org.apache.seatunnel.engine.common.utils.PassiveCompletableFuture;
import org.apache.seatunnel.engine.core.classloader.ClassLoaderService;
import org.apache.seatunnel.engine.core.job.ConnectorJarIdentifier;
@@ -919,9 +918,7 @@ public class TaskExecutionService implements
DynamicMetricsProvider {
private void recycleClassLoader(TaskGroupLocation taskGroupLocation) {
TaskGroupContext context =
executionContexts.get(taskGroupLocation);
- ClassLoader classLoader = context.getClassLoader();
executionContexts.get(taskGroupLocation).setClassLoader(null);
- ClassLoaderUtil.recycleClassLoaderFromThread(classLoader);
classLoaderService.releaseClassLoader(taskGroupLocation.getJobId(),
context.getJars());
}
diff --git
a/seatunnel-engine/seatunnel-engine-server/src/main/java/org/apache/seatunnel/engine/server/master/JobMaster.java
b/seatunnel-engine/seatunnel-engine-server/src/main/java/org/apache/seatunnel/engine/server/master/JobMaster.java
index fd3f9ad0bc..6b90fce8e2 100644
---
a/seatunnel-engine/seatunnel-engine-server/src/main/java/org/apache/seatunnel/engine/server/master/JobMaster.java
+++
b/seatunnel-engine/seatunnel-engine-server/src/main/java/org/apache/seatunnel/engine/server/master/JobMaster.java
@@ -30,7 +30,6 @@ import org.apache.seatunnel.engine.common.config.JobConfig;
import org.apache.seatunnel.engine.common.config.server.CheckpointConfig;
import
org.apache.seatunnel.engine.common.config.server.CheckpointStorageConfig;
import org.apache.seatunnel.engine.common.exception.SeaTunnelEngineException;
-import org.apache.seatunnel.engine.common.loader.ClassLoaderUtil;
import org.apache.seatunnel.engine.common.utils.ExceptionUtil;
import org.apache.seatunnel.engine.common.utils.PassiveCompletableFuture;
import org.apache.seatunnel.engine.core.dag.logical.LogicalDag;
@@ -217,8 +216,6 @@ public class JobMaster {
jobImmutableInformation.getJobId(),
jobImmutableInformation.getPluginJarsUrls());
- ClassLoaderUtil.recycleClassLoaderFromThread(classLoader);
-
final Tuple2<PhysicalPlan, Map<Integer, CheckpointPlan>> planTuple =
PlanUtils.fromLogicalDAG(
logicalDag,
