[JENKINS-74975] Fix Semaphore over-allocation of permits / limit all CleanupTasks #495
Conversation
This file contains 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
dwnusbaum
reviewed
Dec 10, 2024
rsandell
reviewed
Dec 11, 2024
| @@ -382,22 +389,27 @@ public static class Deleter extends ItemListener { | |||
|
|
|||
| private static /* almost final */ int CLEANUP_THREAD_LIMIT = SystemProperties.getInteger(Deleter.class.getName() + ".CLEANUP_THREAD_LIMIT", Integer.valueOf(0)).intValue(); | |||
|
|
|||
| private final transient ExecutorService executorService = Executors.newSingleThreadExecutor(threadFactory()); | |||
There was a problem hiding this comment.
I'm unsure; Will this survive a reload configuration from disk?
There was a problem hiding this comment.
I don't think this class is saved to disk at all; it's just an extension. If you restart Jenkins while a lot of deletion tasks are waiting to run, I do think they will all be lost if that's what you mean, but it looks like that was the case before this PR too.
dwnusbaum
reviewed
Dec 11, 2024
| @@ -382,22 +389,27 @@ public static class Deleter extends ItemListener { | |||
|
|
|||
| private static /* almost final */ int CLEANUP_THREAD_LIMIT = SystemProperties.getInteger(Deleter.class.getName() + ".CLEANUP_THREAD_LIMIT", Integer.valueOf(0)).intValue(); | |||
|
|
|||
| private final transient ExecutorService executorService = Executors.newSingleThreadExecutor(threadFactory()); | |||
There was a problem hiding this comment.
I don't think this class is saved to disk at all; it's just an extension. If you restart Jenkins while a lot of deletion tasks are waiting to run, I do think they will all be lost if that's what you mean, but it looks like that was the case before this PR too.
dwnusbaum
reviewed
Dec 12, 2024
dwnusbaum
approved these changes
Dec 17, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
(amends #237)
The
CleanupTaskof the built-in node were scheduled instantly without acquiring permit from the Semaphore but they were releasing permits, hence creating additional permits over time. Reducing the effectiveness of the limit overtime.Add the Jenkins
built-innode to list of nodes to be limited.NOTES: I guess another solution is to continue not limit the number of
CleanupTaskexecuted for thebuilt-innode but that looks rather confusing in the first place to have aCLEANUP_THREAD_LIMITthat only partially limit the Cleanup tasks..Testing done
-Djenkins.branch.WorkspaceLocatorImpl\$Deleter.CLEANUP_THREAD_LIMIT=1jenkins.branch.WorkspaceLocatorImpl.Deleter.cleanupPool.availablePermits()and validate that it shows1jenkins.branch.WorkspaceLocatorImpl.Deleter.cleanupPool.availablePermits()and validate that it still shows1Submitter checklist