Add support for magic check in EvmDatabaseOps #18167
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
magic-number-support-for-database-restores
branch
3 times, most recently
from
807629c to
3fb203b
Compare
NickLaMuro
changed the title
carbonin
reviewed
Nov 12, 2018
lib/evm_database_ops.rb
Outdated
| @@ -144,7 +144,14 @@ def self.restore(db_opts, connect_opts = {}) | |||
| # 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. | |||
There was a problem hiding this comment.
Can this comment continue to live next to the line it applies to? Maybe we can shorten it to something like this?
Restores need a nil passed to the block form of
downloadto accommodate streaming
There was a problem hiding this comment.
Sure, I can look into that.
spec/lib/evm_database_ops_spec.rb
Outdated
|
|
||
| it "yields `db_opt`s only" do | ||
| allow(file_storage).to receive(:download) { |&block| block.call(input_path) } | ||
| expect { |rspec_probe| |
There was a problem hiding this comment.
Can you fix the bot comments about the multi-line blocks and curly-braces?
There was a problem hiding this comment.
I guess, I just figured it would have also barfed about doing a:
this_my_block do |var|
# stuff and things
end.call_a_method_on_the_resultBut maybe it won't... ¯\_(ツ)_/¯
spec/lib/evm_database_ops_spec.rb
Outdated
| { :dbname => "vmdb_production", :local_file => input_path }, | ||
| :pgdump | ||
| ] | ||
| expect { |rspec_probe| |
Calls the newly created method `MiqFileStorage.magic_number_for` to pre-fetch the magic from the file that will be downloaded, and send that to `PostgresAdmin` as a `database_opts` to avoid checking it on it's end. Note: Shortened a comment in here, but since it is part of the git history, I am fine with it. Those willing to dig deep can find it.
NickLaMuro
force-pushed
the
magic-number-support-for-database-restores
branch
from
3fb203b to
ca92710
Compare
|
@carbonin comments addressed. |
|
Checked commit NickLaMuro@ca92710 with ruby 2.3.3, rubocop 0.52.1, haml-lint 0.20.0, and yamllint 1.10.0 |
carbonin
approved these changes
Nov 12, 2018
simaishi
pushed a commit
that referenced
this pull request
Nov 13, 2018
…tabase-restores Add support for magic check in EvmDatabaseOps (cherry picked from commit 3b053f0)
|
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.
Calls the newly created method
MiqFileStorage.magic_number_forto pre-fetch the magic from the file that will be downloaded, and send that toPostgresAdminas adatabase_optsto avoid checking it on it's end.Requires changes in gems-pending to work (Update: done)
Links
manageiq-gems-pending