[JENKINS-75679] KeyMaterial variant passing VirtualChannel to close
#166
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jglick
commented
May 29, 2025
| try { | ||
| dockerConfig.deleteRecursive(); | ||
| } catch (InterruptedException x) { | ||
| // TODO would better have been thrown from KeyMaterial.close to begin with |
Member
Author
There was a problem hiding this comment.
(also addressed with new signature)
jglick
commented
May 29, 2025
| private static class RegistryKeyMaterial2 extends KeyMaterial2 { | ||
|
|
||
| private final FilePath dockerConfig; | ||
| private final String dockerConfig; |
Member
Author
There was a problem hiding this comment.
The key fix: avoids saving a FilePathPickle in program.dat.
jglick
commented
May 29, 2025
| private static final class ServerKeyMaterial2 extends KeyMaterial2 { | ||
|
|
||
| private final FilePath[] tempDirs; | ||
| private final @CheckForNull String tempDir; |
Member
Author
There was a problem hiding this comment.
Same here.
Original code was unnecessarily complex handling an array of arbitrary size, when in fact it was only ever called with zero or one dirs.
amuniz
approved these changes
May 30, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Needed for jenkinsci/docker-workflow-plugin#351.