Skip to content

Plugin class loader fixes #17041

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

Merged
dain merged 2 commits into from
Apr 16, 2023
Merged

Plugin class loader fixes #17041

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
73dc71e
Destroy duplicate class loaders if catalog creation fails
dain Apr 15, 2023
7263c66
Add catalog version to plugin class loader id
dain Apr 15, 2023
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
30 changes: 18 additions & 12 deletions core/trino-main/src/main/java/io/trino/connector/DefaultCatalogFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,18 +121,24 @@ public CatalogConnector createCatalog(CatalogProperties catalogProperties)
catalogProperties.getCatalogHandle(),
factory.getDuplicatePluginClassLoaderFactory(),
handleResolver);
Connector connector = createConnector(
catalogProperties.getCatalogHandle().getCatalogName(),
catalogProperties.getCatalogHandle(),
factory.getConnectorFactory(),
duplicatePluginClassLoaderFactory,
catalogProperties.getProperties());
return createCatalog(
catalogProperties.getCatalogHandle(),
catalogProperties.getConnectorName(),
connector,
duplicatePluginClassLoaderFactory::destroy,
Optional.of(catalogProperties));
try {
Connector connector = createConnector(
catalogProperties.getCatalogHandle().getCatalogName(),
catalogProperties.getCatalogHandle(),
factory.getConnectorFactory(),
duplicatePluginClassLoaderFactory,
catalogProperties.getProperties());
return createCatalog(
catalogProperties.getCatalogHandle(),
catalogProperties.getConnectorName(),
connector,
duplicatePluginClassLoaderFactory::destroy,
Optional.of(catalogProperties));
}
catch (Throwable e) {
duplicatePluginClassLoaderFactory.destroy();
throw e;
}
}

@Override
Expand Down
4 changes: 3 additions & 1 deletion core/trino-main/src/main/java/io/trino/server/PluginClassLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
public class PluginClassLoader
extends URLClassLoader
{
private final String id;
private final String pluginName;
private final Optional<CatalogHandle> catalogHandle;
private final ClassLoader spiClassLoader;
Expand Down Expand Up @@ -69,6 +70,7 @@ private PluginClassLoader(
this.spiClassLoader = requireNonNull(spiClassLoader, "spiClassLoader is null");
this.spiPackages = ImmutableList.copyOf(spiPackages);
this.spiResources = ImmutableList.copyOf(spiResources);
this.id = pluginName + catalogHandle.map(name -> ":%s:%s".formatted(name.getCatalogName(), name.getVersion())).orElse("");
}

public PluginClassLoader duplicate(CatalogHandle catalogHandle)
Expand All @@ -91,7 +93,7 @@ public PluginClassLoader withUrl(URL url)

public String getId()
{
return pluginName + catalogHandle.map(name -> ":" + name).orElse("");
return id;
}

@Override
Expand Down