Skip to content
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.

Sign up for GitHub

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

[Fix][Zeta] Fix thread classloader be set to null when use cache mode #6509

Merged
merged 2 commits into from
Mar 15, 2024
Merged

[Fix][Zeta] Fix thread classloader be set to null when use cache mode #6509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fcdd340
[Fix][Zeta] Fix thread classloader be set to null when use cache mode
Hisoka-X Mar 14, 2024
6247795
[Fix][Zeta] Fix thread classloader be set to null when use cache mode
Hisoka-X Mar 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 0 additions & 35 deletions ...ngine-common/src/main/java/org/apache/seatunnel/engine/common/loader/ClassLoaderUtil.java
View file
Open in desktop

This file was deleted.

13 changes: 12 additions & 1 deletion ...src/main/java/org/apache/seatunnel/engine/core/classloader/DefaultClassLoaderService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,16 +88,27 @@ public synchronized void releaseClassLoader(long jobId, Collection<URL> jars) {
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);
classLoaderReferenceCount.remove(jobId);
}
}

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("");
}
Expand Down
2 changes: 0 additions & 2 deletions ...re/src/main/java/org/apache/seatunnel/engine/core/parse/MultipleTableJobConfigParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@
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;
Expand Down Expand Up @@ -209,7 +208,6 @@ public ImmutablePair<List<Action>, Set<URL>> parse(ClassLoaderService classLoade
classLoaderService.releaseClassLoader(
Long.parseLong(jobConfig.getJobContext().getJobId()), connectorJars);
}
ClassLoaderUtil.recycleClassLoaderFromThread(classLoader);
}
}

Expand Down
31 changes: 31 additions & 0 deletions ...re/src/test/java/org/apache/seatunnel/engine/core/classloader/ClassLoaderServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,4 +69,35 @@ void testSameJarInDifferentJob() throws MalformedURLException {
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());
}
}
3 changes: 0 additions & 3 deletions ...-engine-server/src/main/java/org/apache/seatunnel/engine/server/TaskExecutionService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
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;
Expand Down Expand Up @@ -919,9 +918,7 @@ void taskDone(Task task) {

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());
}

Expand Down
3 changes: 0 additions & 3 deletions ...nnel-engine-server/src/main/java/org/apache/seatunnel/engine/server/master/JobMaster.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
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;
Expand Down Expand Up @@ -217,8 +216,6 @@ public void init(long initializationTimestamp, boolean restart) throws Exception
jobImmutableInformation.getJobId(),
jobImmutableInformation.getPluginJarsUrls());

ClassLoaderUtil.recycleClassLoaderFromThread(classLoader);

final Tuple2<PhysicalPlan, Map<Integer, CheckpointPlan>> planTuple =
PlanUtils.fromLogicalDAG(
logicalDag,
Expand Down
Loading