Overhauled ProxyWhitelist
#549
Merged
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
jglick
commented
Dec 20, 2023
|
|
||
| @Override public final boolean permitsMethod(@NonNull Method method, @NonNull Object receiver, @NonNull Object[] args) { | ||
| String key = canonicalMethodSig(method); |
There was a problem hiding this comment.
Note that this will no longer cache results when there is a distinct Method with the same signature, which could happen when there is a new copy of the Class from a distinct ClassLoader. However https://github.com/jenkinsci/workflow-cps-plugin/blob/3a59e40fb41d2774421ce3d7c00480e5917edb76/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/GroovyClassLoaderWhitelist.java#L45 consults its delegate https://github.com/jenkinsci/workflow-cps-plugin/blob/3a59e40fb41d2774421ce3d7c00480e5917edb76/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsGroovyShell.java#L181 last so I do not think that would normally happen. Once the system warms up, the normal path through ought to be fast. Would be useful to have some JMH benchmarks if they can run via RealJenkinsRule.
Vlatombe
approved these changes
Dec 20, 2023
…ere are no signatures; avoiding `Stream.anyMatch`
… prior to some other simplification, but not now
Vlatombe
approved these changes
Dec 20, 2023
|
I would like to do some sort of performance sanity check of this. Also, it is probably not the best idea to release a rewrite like this right before taking time off! |
|
Installing Log |
|
Set up a controller running 3872d58 with 10 (mock agent) executors and a pipeline with a string parameter library 'github.com/jglick/sample-pipeline-library'
def changes = currentBuildExt().hasChangeIn('xxx')
echo """
Hello at ${new Date()}!
Triggered as $x
Do we have any changes? $changes
"""
node {
parallel main: {
stage('Build') {
withMockLoad(averageDuration: 3) {
sh MOCK_LOAD_COMMAND
}
}
stage('Results') {
junit 'mock-junit.xml'
archiveArtifacts 'mock-artifact-*.txt'
}
}, stuff: {
sh 'sleep 3'
echo(/hello from ${Jenkins.instance}/) // approved
}
}
def r = new Random()
['a', 'b'].each {one ->
def p = r.nextInt(20)
echo "$one triggering at $p"
build job: JOB_NAME, wait: false, parameters: [string(name: 'x', value: String.valueOf(p))]
}I saw no evidence of classes from this plugin in thread dumps, other than momentarily while processing the |
dwnusbaum
approved these changes
Jan 2, 2024
| private final Map<ProxyWhitelist,Void> wrappers = new WeakHashMap<>(); | ||
|
|
||
| // TODO Consider StampedLock when we switch to Java8 for better performance - https://dzone.com/articles/a-look-at-stampedlock | ||
| private ReentrantReadWriteLock lock = new ReentrantReadWriteLock(); |
There was a problem hiding this comment.
FWIW, I think the old code would have blocked permits* calls from other threads while ApprovedWhitelist was being reconfigured, while the new code with the lock removed reconfigures things on the first thread that sees ApprovedWhitelist.initialized change from false to true, and other threads will not be blocked and will either use the old or new list depending on timing. Seems ok to me, but I just wanted to note the behavior change.
There was a problem hiding this comment.
Right, I think the lock was there merely to prevent momentary inconsistencies, not specifically to block permit* calls.
|
Had a lot of problems running ATH due to mock UC issues, e.g. Had to manually delete local repository files. Finally managed to get Guice errorand then failing in the test proper Assertion failurewhich is fixed using |
This was referenced Jan 3, 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.
Fixes jenkinsci/acceptance-test-harness#1444. (I guess; I do not care to run ATH locally, but anyway the problenatic code is completely rewritten so it ought to be possible to revert jenkinsci/acceptance-test-harness#1445.) Motivated by #545 (comment): there was some code that attempted to work around Guice cycles, but I guess it behaved nondeterministically depending on extension load order. Simplified the whole thing, which required rewriting
ProxyWhitelistto be much simpler and not try to cache anything, and rewritingEnumeratingWhitelistto use a simpler cache system (replacing #180 and various other accreted patches).