[FIXES JENKINS-47439] Setup wizard does not resume after restart #3166
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
On first startup, the setup wizard goes into state NEW and the filter to force display the setup wizard is installed. On second startup, the setup wizard goes into state RESTART (which assumes the setup wizard is done), and the setup wizard is skipped completely. This test expects that state NEW is retained upon restart when nothing is done.
In some cases, the heuristics to determine the current setup wizard state are fragile. It is safer to persist the install state so that upon restart, the setup wizard can resume where it was left off.
oleg-nenashev
approved these changes
Nov 29, 2017
| * Checks whether the given filter is already registered in the chain. | ||
| * @param filter the filter to check. | ||
| * @return true if the filter is already registered in the chain. | ||
| * @since XXX |
|
|
||
| /** | ||
| * Returns whether the setup wizard filter is currently registered. | ||
| * @since XXX |
| /** | ||
| * Called upon install state update. | ||
| * @param state the new install state. | ||
| */ |
| } | ||
| saveQuietly(); |
There was a problem hiding this comment.
Is it safe to save the entire Jenkins instance at the current state. IIUC it may be not fully initialized though the state should likely indicate it
There was a problem hiding this comment.
SetupWizard is initialized after InitMilestone.COMPLETED so AFAIU this is safe.
oleg-nenashev
requested changes
Dec 1, 2017
There was a problem hiding this comment.
Test failures are related to the change as I see. "com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException: 403 Forbidden for http://localhost:62736/jenkins/" && Co likely happen due to the Install state lifecycle change. It needs a fix
oleg-nenashev
added
the
needs-comments-resolved
oleg-nenashev
added
needs-more-reviews
jtnord
reviewed
Dec 1, 2017
| @@ -92,7 +92,7 @@ public T get() { | |||
| */ | |||
| public static void proceedToNextStateFrom(InstallState prior) { | |||
| InstallState next = getNextInstallState(prior); | |||
| if (Main.isDevelopmentMode) LOGGER.info("Install state transitioning from: " + prior + " to: " + next); | |||
| LOGGER.log(Main.isDevelopmentMode ? Level.INFO : Level.FINE, "Install state transitioning from: " + prior + " to: " + next); | |||
There was a problem hiding this comment.
NIT: use parameterized logging
LOGGER.log(Main.isDevelopmentMode ? Level.INFO : Level.FINE, "Install state transitioning from: {0} to: {1}", new Object[] {from, to});* Removed static isUsingSecurityToken. Now only determined from install state. * Call onInstallStateUpdate before InstallState#initializeState as the latter can update state.
|
looks like the run on linux is stuck.. |
oleg-nenashev
approved these changes
Dec 3, 2017
oleg-nenashev
added
the
on-hold
oleg-nenashev
added
ready-for-merge
|
It was waiting long enough. I want to give it a chance to be backported to .3, because it is a serious issue. 🚢 🇮🇹 |
olivergondza
pushed a commit
that referenced
this pull request
Jan 31, 2018
* [JENKINS-47439] Add a failing test On first startup, the setup wizard goes into state NEW and the filter to force display the setup wizard is installed. On second startup, the setup wizard goes into state RESTART (which assumes the setup wizard is done), and the setup wizard is skipped completely. This test expects that state NEW is retained upon restart when nothing is done. * [JENKINS-47439] Persist InstallState In some cases, the heuristics to determine the current setup wizard state are fragile. It is safer to persist the install state so that upon restart, the setup wizard can resume where it was left off. * Missing javadoc and since for new public methods * s/XXX/FIXME/ * Missed that one * Setup wizard filter should be removed when entering a state where setup is complete * Use parameterized logging * Improvements over previous impl * Removed static isUsingSecurityToken. Now only determined from install state. * Call onInstallStateUpdate before InstallState#initializeState as the latter can update state. * Triggering a new build (cherry picked from commit 30ab448)
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.
See JENKINS-47439.
More details about the fix available in commit logs.
Proposed changelog entries
Submitter checklist
* Use the
Internal:prefix if the change has no user-visible impact (API, test frameworks, etc.)Desired reviewers
@jenkinsci/code-reviewers
@reviewbybees