Skip to content

Call GroovyClassLoader.close also if build never starts #672

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
merged 1 commit into from
Mar 6, 2023
Merged

Call GroovyClassLoader.close also if build never starts #672

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 19 additions & 7 deletions plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -557,13 +557,19 @@ private Env createInitialEnv() {

private CpsScript parseScript() throws IOException {
// classloader hierarchy. See doc/classloader.md
trusted = new CpsGroovyShellFactory(this).forTrusted().build();
shell = new CpsGroovyShellFactory(this).withParent(trusted).build();
CpsScript s;
try {
trusted = new CpsGroovyShellFactory(this).forTrusted().build();
shell = new CpsGroovyShellFactory(this).withParent(trusted).build();

CpsScript s = (CpsScript) shell.reparse("WorkflowScript",script);
s = (CpsScript) shell.reparse("WorkflowScript",script);

for (Entry<String, String> e : loadedScripts.entrySet()) {
shell.reparse(e.getKey(), e.getValue());
for (Entry<String, String> e : loadedScripts.entrySet()) {
shell.reparse(e.getKey(), e.getValue());
}
} catch (RuntimeException | Error x) {
closeShells();
throw x;
}

s.execution = this;
Expand Down Expand Up @@ -1304,20 +1310,26 @@ synchronized void onProgramEnd(Outcome outcome) {
this.persistedClean = Boolean.TRUE;
}

void cleanUpHeap() {
LOGGER.log(Level.FINE, "cleanUpHeap on {0}", owner);
private void closeShells() {
try {
if (shell != null) {
LOGGER.fine(() -> "closing main class loader from " + owner);
shell.getClassLoader().close();
shell = null;
}
if (trusted != null) {
LOGGER.fine(() -> "closing trusted class loader from " + owner);
trusted.getClassLoader().close();
trusted = null;
}
} catch (IOException x) {
LOGGER.log(Level.WARNING, "failed to close class loaders from " + owner, x);
}
}

void cleanUpHeap() {
LOGGER.log(Level.FINE, "cleanUpHeap on {0}", owner);
closeShells();
if (scriptClass != null) {
try {
cleanUpLoader(scriptClass.getClassLoader(), new HashSet<>(), new HashSet<>());
Expand Down