Fix uri dirname parsing for swift restore #18166
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
The swift protocol is the only file storage used by `EvmDatabaseOps` at this time that uses query params as part of setting it's options. The previous implementation of `.with_file_storage` would use a simple `File.dirname` to determine the mount point. This causes the query params to be completely stripped from the uri, and messes with the configuration set by the user via the query params. There is also a quirk with the implementation of `URI::FTP` (stdlib) that overrides `.path` differently since it swaps it's `"/"` characters for `"%2F"`, which we don't happening unannounced. So for the fix, we use `URI::Generic.new` directly, and avoid the `URI.parse` method since it will make use of `URI::FTP` in those cases. Split is used as just a convenient way of getting the args for `URI::Generic.new`.
NickLaMuro
force-pushed
the
fix_uri_for_database_restore_mount_point
branch
from
ad4ec3a to
2d9e5d7
Compare
|
Checked commit NickLaMuro@2d9e5d7 with ruby 2.3.3, rubocop 0.52.1, haml-lint 0.20.0, and yamllint 1.10.0 lib/evm_database_ops.rb
|
kbrock
reviewed
Nov 6, 2018
| @@ -291,10 +291,28 @@ def execute_with_file_storage(action = :backup) | |||
| execute_with_file_storage(:restore) | |||
| end | |||
|
|
|||
| it "parses the dirname of the `uri` and passes that in `connect_opts`" do | |||
There was a problem hiding this comment.
Suggested change
| it "parses the dirname of the `uri` and passes that in `connect_opts`" do | |
| it "parses the dirname of the 'uri' and passes that in 'connect_opts'" do |
do you really want backticks in here?
There was a problem hiding this comment.
I always use backticks to denote variable names (pulled from markdown syntax). It isn't executed, so it is just a standard I am using to say this_is_code.
There was a problem hiding this comment.
Sorry, to further explain, I use backticks because I want to clarify that I am referencing a variable or some other syntax element, and not a string value (so not object.class.name.downcase == 'uri').
simaishi
pushed a commit
that referenced
this pull request
Nov 7, 2018
…e_mount_point Fix uri dirname parsing for swift restore (cherry picked from commit 3d2a9b6)
|
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 swift protocol is the only file storage used by
EvmDatabaseOpsat this time that uses query params as part of setting it's options.The previous implementation of
.with_file_storagewould use a simpleFile.dirnameto determine the mount point. This causes the query params to be completely stripped from the uri, and messes with the configuration set by the user via the query params.There is also a quirk with the implementation of
URI::FTP(stdlib) that overrides.pathdifferently since it swaps it's"/"characters for"%2F", which we don't happening unannounced.So for the fix, we use
URI::Generic.newdirectly, and avoid theURI.parsemethod since it will make use ofURI::FTPin those cases. Split is used as just a convenient way of getting the args forURI::Generic.new.