Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[JENKINS-32820, JENKINS-42164] - Windows service restart does not retain the build queue #2746

Merged
merged 5 commits into from Feb 18, 2017

Conversation

3 participants
@oleg-nenashev
Copy link
Member

oleg-nenashev commented Feb 12, 2017

This is a merged version of #2019 from @atcarmo

  • - JENKINS-32820 Jenkins.cleanUp() was not called inside WindowsServiceLifecycle.restart()
  • - JENKINS-42164 Perform restart if the cleanup fails

Basically Jenkins.cleanUp() is not being called inside the implementation of the restart method of WindowsServifeLifecycle. This caused, among other things, the queue not to be persisted on restart while Jenkins is installed as a Windows Service.

@jenkinsci/code-reviewers @daniel-beck Please approve (especially the exception suppression logic)

atmcarmo and others added some commits Feb 7, 2016

CleanUp() call during restart() is now surrounded but try/catch, whic…
…h allows the restart to continue if the cleanUp() method fails.
Merge branch 'JENKINS-32820' of https://github.com/atcarmo/jenkins in…
…to bug/JENKINS-32820

Conflicts:
	core/src/main/java/hudson/WebAppMain.java
	core/src/main/java/hudson/lifecycle/SolarisSMFLifecycle.java
	core/src/main/java/hudson/lifecycle/UnixLifecycle.java
@oleg-nenashev

This comment has been minimized.

Copy link
Member Author

oleg-nenashev commented Feb 12, 2017

OK, after merge I should always try to build the project...

@daniel-beck daniel-beck self-assigned this Feb 12, 2017

@oleg-nenashev

This comment has been minimized.

Copy link
Member Author

oleg-nenashev commented Feb 12, 2017

Retriggering the test (the failure seems to be unrelated)

@oleg-nenashev

This comment has been minimized.

Copy link
Member Author

oleg-nenashev commented Feb 17, 2017

Merging since restart should definitely proceed after the contextDestroyed() according to the code. Will create a placeholder issue

@oleg-nenashev

This comment has been minimized.

Copy link
Member Author

oleg-nenashev commented Feb 17, 2017

Created https://issues.jenkins-ci.org/browse/JENKINS-42164 . Even taking the importance of the fix for Windows, I would rather vote against backporting, at least to the next .1 LTS. .2 may be fine

@oleg-nenashev oleg-nenashev changed the title [JENKINS-32820] - Windows service restart does not retain the build queue [JENKINS-32820, JENKINS-42164] - Windows service restart does not retain the build queue Feb 17, 2017

@oleg-nenashev

This comment has been minimized.

Copy link
Member Author

oleg-nenashev commented Feb 17, 2017

Cannot squash from UI, because GitHub will keep me as a committer then

@oleg-nenashev oleg-nenashev self-assigned this Feb 17, 2017

@oleg-nenashev oleg-nenashev merged commit 4ab6938 into jenkinsci:master Feb 18, 2017

1 of 2 checks passed

continuous-integration/jenkins/pr-head Something is wrong with the build of this commit
Details
Jenkins This pull request looks good
Details

olivergondza added a commit that referenced this pull request Mar 15, 2017

Merge pull request #2746 from oleg-nenashev/bug/JENKINS-32820
[JENKINS-32820, JENKINS-42164] - Windows service restart does not retain the build queue
(cherry picked from commit 4ab6938)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.