Fix reloading configuration from disk #545
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
This makes the `load()` method work properly when called after startup, in case of a reload configuration from disk for example. Functionally, the `reconfigure()` method needs to be called implicitly when calling `load()`, because it updates a snapshot state that is used by running builds. If the persisted state has changed on disk then loaded, the snapshot needs to be updated accordingly. Without this patch, the `ScriptApproval` state is correct, but anything that has changed since last time it was loaded is not reflected on running builds.
jglick
approved these changes
Nov 27, 2023
Comment on lines
+190
to
+192
| r.assertLogNotContains("org.jenkinsci.plugins.scriptsecurity.sandbox.RejectedAccessException: " | ||
| + "Scripts not permitted to use staticMethod jenkins.model.Jenkins getInstance", | ||
| r.assertBuildStatus(Result.SUCCESS, p.scheduleBuild2(0).get())); |
There was a problem hiding this comment.
Perhaps besides the point since you approved the whole script anyway, and if you had not, you would also get an error on method jenkins.model.Jenkins getLabels, but OK.
|
I suspect this has caused jenkinsci/acceptance-test-harness#1444 (valid issues not just a test issue) |
Vlatombe
commented
Dec 18, 2023
Comment on lines
+539
to
+540
| LOG.log(Level.FINE, "Reconfiguring ScriptApproval after loading configuration from disk"); | ||
| reconfigure(); |
There was a problem hiding this comment.
Looks like this is what is causing issues with the tests, most specifically with the hot plugin load.
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.
This makes the
load()method work properly when called after startup, in case of a reload configuration from disk for example.Functionally, the
reconfigure()method needs to be called implicitly when callingload(), because it updates a snapshot state that is used by running builds. If the persisted state has changed on disk then loaded, the snapshot needs to be updated accordingly.Without this patch, the
ScriptApprovalstate is correct, but anything that has changed since last time it was loaded is not reflected on running builds.Testing done
Submitter checklist