This repository was archived by the owner on Aug 29, 2018. It is now read-only.
FrontendHttpServer: Recover from missing manifest#6285
Merged
openshift-bot merged 1 commit intoopenshift:masterfrom Oct 22, 2015
Merged
Conversation
OpenShift::Runtime::FrontendHttpServer#initialize: Rescue any exception from initializing the cartridge model, and set @standalone_web_proxy to false in that contingency. Before this commit, failure to initialize the cartridge model would cause a failure to initialize the frontend http server, which would cause a failure to initialize the container plugin, which would prevent the container plugin's destroy method from finishing. Consequently, it was impossible to delete a gear with a bad manifest.yml file. This commit fixes bug 1273658.
|
Online Test Results: SUCCESS (https://ci.dev.openshift.redhat.com/jenkins/job/test_pull_requests/8964/) |
|
Evaluated for online test up to 650f836 |
Contributor
|
@Miciah Seems to be a reasonable compromise for these errors. LGTM. |
Contributor
Author
|
Thanks! openshift-bot, please [merge]! |
|
Online Merge Results: SUCCESS (https://ci.dev.openshift.redhat.com/jenkins/job/merge_pull_requests/6588/) (Image: devenv_5677) |
|
Evaluated for online merge up to 650f836 |
openshift-bot
pushed a commit
that referenced
this pull request
Oct 22, 2015
…ecover-from-missing-manifest Merged by openshift-bot
This file contains hidden or 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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
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.
OpenShift::Runtime::FrontendHttpServer#initialize: Rescue any exception from initializing the cartridge model, and set@standalone_web_proxyto false in that contingency.Before this commit, failure to initialize the cartridge model would cause a failure to initialize the frontend http server, which would cause a failure to initialize the container plugin, which would prevent the container plugin's
destroymethod from finishing. Consequently, it was impossible to delete a gear with a badmanifest.ymlfile.This commit fixes bug 1273658.
[test] [extended:gear]
@jwhonce, does this look reasonable?