You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ch...@apache.org on 2020/08/16 21:28:24 UTC
[flink] 02/05: [FLINK-16245][table] Close user classloader
This is an automated email from the ASF dual-hosted git repository.
chesnay pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 30e82697a3f25a638462d1af9732b6c35132def2
Author: Arvid Heise <ar...@ververica.com>
AuthorDate: Mon Mar 2 14:12:32 2020 +0100
[FLINK-16245][table] Close user classloader
---
.../src/main/java/org/apache/flink/client/ClientUtils.java | 3 ++-
.../flink/table/client/gateway/local/ExecutionContext.java | 9 ++++++++-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/flink-clients/src/main/java/org/apache/flink/client/ClientUtils.java b/flink-clients/src/main/java/org/apache/flink/client/ClientUtils.java
index b651438..8e4f5e4 100644
--- a/flink-clients/src/main/java/org/apache/flink/client/ClientUtils.java
+++ b/flink-clients/src/main/java/org/apache/flink/client/ClientUtils.java
@@ -40,6 +40,7 @@ import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.net.URL;
+import java.net.URLClassLoader;
import java.util.List;
import java.util.concurrent.ExecutionException;
@@ -54,7 +55,7 @@ public enum ClientUtils {
private static final Logger LOG = LoggerFactory.getLogger(ClientUtils.class);
- public static ClassLoader buildUserCodeClassLoader(
+ public static URLClassLoader buildUserCodeClassLoader(
List<URL> jars,
List<URL> classpaths,
ClassLoader parent,
diff --git a/flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/local/ExecutionContext.java b/flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/local/ExecutionContext.java
index 60e7736..c0d0bf1 100644
--- a/flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/local/ExecutionContext.java
+++ b/flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/local/ExecutionContext.java
@@ -106,9 +106,11 @@ import org.slf4j.LoggerFactory;
import javax.annotation.Nullable;
+import java.io.IOException;
import java.lang.reflect.Method;
import java.net.URISyntaxException;
import java.net.URL;
+import java.net.URLClassLoader;
import java.nio.file.Paths;
import java.time.Duration;
import java.util.ArrayList;
@@ -139,7 +141,7 @@ public class ExecutionContext<ClusterID> {
private final Environment environment;
private final SessionContext originalSessionContext;
- private final ClassLoader classLoader;
+ private final URLClassLoader classLoader;
private final Configuration flinkConfig;
private final ClusterClientFactory<ClusterID> clusterClientFactory;
@@ -305,6 +307,11 @@ public class ExecutionContext<ClusterID> {
/** Close resources associated with this ExecutionContext, e.g. catalogs. */
public void close() {
wrapClassLoader(() -> getCatalogs().values().forEach(Catalog::close));
+ try {
+ classLoader.close();
+ } catch (IOException e) {
+ LOG.debug("Error while closing class loader.", e);
+ }
}
//------------------------------------------------------------------------------------------------------------------