[FLINK-9844][client] PackagedProgram#close() closes ClassLoader

deepfield · Feb 3, 2021 · 3ff5361 · 3ff5361
1 parent 91f4a98
commit 3ff5361
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 11 deletions.
diff --git a/flink-clients/src/main/java/org/apache/flink/client/program/PackagedProgram.java b/flink-clients/src/main/java/org/apache/flink/client/program/PackagedProgram.java
@@ -43,6 +43,7 @@
 import java.net.MalformedURLException;
 import java.net.URISyntaxException;
 import java.net.URL;
+import java.net.URLClassLoader;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -89,7 +90,7 @@ public class PackagedProgram implements AutoCloseable {
 
  private final List<URL> classpaths;
 
- private final ClassLoader userCodeClassLoader;
+ private final URLClassLoader userCodeClassLoader;
 
  private final SavepointRestoreSettings savepointSettings;
 
@@ -624,6 +625,11 @@ private static void checkJarFile(URL jarfile) throws ProgramInvocationException
 
  @Override
  public void close() {
+ try {
+ userCodeClassLoader.close();
+ } catch (IOException e) {
+ LOG.debug("Error while closing user-code classloader.", e);
+ }
  try {
  deleteExtractedLibraries();
  } catch (Exception e) {

diff --git a/...e-web/src/test/java/org/apache/flink/runtime/webmonitor/handlers/JarSubmissionITCase.java b/...e-web/src/test/java/org/apache/flink/runtime/webmonitor/handlers/JarSubmissionITCase.java
@@ -22,12 +22,9 @@
 import org.apache.flink.runtime.rest.messages.JobPlanInfo;
 import org.apache.flink.runtime.util.BlobServerResource;
 import org.apache.flink.runtime.webmonitor.TestingDispatcherGateway;
-import org.apache.flink.util.OperatingSystem;
 import org.apache.flink.util.TestLogger;
 
 import org.junit.Assert;
-import org.junit.Assume;
-import org.junit.BeforeClass;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
@@ -51,13 +48,6 @@ public class JarSubmissionITCase extends TestLogger {
 
  @Rule public final BlobServerResource blobServerResource = new BlobServerResource();
 
- @BeforeClass
- public static void checkOS() {
- Assume.assumeFalse(
- "This test fails on Windows due to unclosed JarFiles, see FLINK-9844.",
- OperatingSystem.isWindows());
- }
-
  @Test
  public void testJarSubmission() throws Exception {
  final TestingDispatcherGateway restfulGateway =