Sync with stable/3.0 part of the rails app for apply_role improvements #18
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
rsalevsky
approved these changes
Mar 1, 2017
There was an attempt to fix the internal API so that ServiceObject.apply_role always returns [int, str], but this actually breaks the UI-only path in the controller. So revert this and document with a FIXME that this should eventually be fixed by moving everything to [int, hash] where we will have more freedom. https://bugzilla.suse.com/show_bug.cgi?id=989958 (cherry picked from commit 1ad0664) (cherry picked from commit ec17274)
We catch all exceptions that aren't caught from this method to set the status of the proposal to "failed", to avoid people being blocked by a proposal staying forever in "applying". This helps with https://bugzilla.suse.com/show_bug.cgi?id=840255 (cherry picked from commit 43bc948) (cherry picked from commit 50ec9c0)
Was part of crowbar#560 (cherry picked from commit 7d12ecb) (cherry picked from commit 457222b)
vuntz
force-pushed
the
staging-sync-apply_role
branch
from
982ccde
to
5d1b187
Compare
houndci-bot
reviewed
Jun 20, 2017
There was a problem hiding this comment.
Some files could not be reviewed due to errors:
.rubocop.yml: Style/AlignHash has the wrong namespace - should be Layout
.rubocop.yml: Style/AlignHash has the wrong namespace - should be Layout
.rubocop.yml: Style/AlignParameters has the wrong namespace - should be Layout
.rubocop.yml: Style/EmptyLinesAroundBlockBody has the wrong namespace - should be Layout
.rubocop.yml: Style/MultilineOperationIndentation has the wrong namespace - should be Layout
Error: obsolete parameter AlignWith (for Lint/EndAlignment) found in .rubocop.ymlAlignWithhas been renamed toEnforcedStyleAlignWith
tpatzig
requested changes
Jun 21, 2017
| @logger.debug "batches: #{batches.inspect}" | ||
|
|
||
| # Cache attributes that are useful later on | ||
| pre_cached_nodes.each do |node_name, node| |
There was a problem hiding this comment.
can we add the line next if node.nil? here as well, to skip nodes, that no longer exists, but still referenced in chef.
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.
There were some logging improvements as well as changes to make the code more solid and deal better with exceptions when clicking on "apply".
@tpatzig with these fixes, the issue with lock files that are blocking chef-client from running on nodes will not be triggered anymore.