Fix send_args for EvmDatabaseOps.restore #18144
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
NickLaMuro
force-pushed
the
fix_miq_file_storage_send_args_for_download
branch
from
5d14f07 to
0867879
Compare
carbonin
reviewed
Nov 5, 2018
lib/evm_database_ops.rb
Outdated
| # are doing a `MiqFileStorage.download`, and the interface for that | ||
| # method is to pass a `nil` for the block form since we are streaming the | ||
| # data from the command that we are writting as part of the block. | ||
| send_args.insert(0, nil) if action == :restore |
There was a problem hiding this comment.
Maybe #unshift(nil) rather than inserting before the 0th element here?
The `send_args` that are to be passed to `MiqFileStorage.download` didn't account for the changes between `.upload` and `.download`, which downloading expects a `nil` for the first argument when in block form (who writes this crap*...). To account for that, we prepend the `nil` value if we are doing a `.restore`, which is the only time we are doing a download from a file storage. Partially addresses issues in the following tickets: - https://bugzilla.redhat.com/show_bug.cgi?id=1633573 - https://bugzilla.redhat.com/show_bug.cgi?id=1513520 * Hint: It was me...
NickLaMuro
force-pushed
the
fix_miq_file_storage_send_args_for_download
branch
from
0867879 to
60fed56
Compare
|
Checked commit NickLaMuro@60fed56 with ruby 2.3.3, rubocop 0.52.1, haml-lint 0.20.0, and yamllint 1.10.0 lib/evm_database_ops.rb
|
carbonin
approved these changes
Nov 5, 2018
simaishi
pushed a commit
that referenced
this pull request
Nov 5, 2018
…rgs_for_download Fix send_args for EvmDatabaseOps.restore (cherry picked from commit 1775555) https://bugzilla.redhat.com/show_bug.cgi?id=1633573 https://bugzilla.redhat.com/show_bug.cgi?id=1513520
|
Hammer backport details: |
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.
The
send_argsthat are to be passed toMiqFileStorage.downloaddidn't account for the changes between.uploadand.download, which downloading expects anilfor the first argument when in block form.To account for that, we prepend the
nilvalue if we are doing a.restore, which is the only time we are doing a download from a file storage.Links
MiqFileStorage.download: https://github.com/ManageIQ/manageiq-gems-pending/blob/86396bfb/lib/gems/pending/util/miq_file_storage.rb#L131-L133