Reorder commands in ORA get via SSH - #7215
Merged
Merged
Conversation
This delays the remote-end `cat` command until just before its output is needed, for two reasons: 1. The command output is not needed if `get` decides to use scp 2. When getting multiple files encrypted by git-annex (which would use scp, due to size not being part of the annex key), the `cat` output would remain in standard output and would be read when checking whether the *next* file exists, crashing upon `decode()` datalad#7214
bpoldrack
approved these changes
Dec 5, 2022
| @@ -0,0 +1,3 @@ | |||
| ### 🐛 Bug Fixes | |||
|
|
|||
| - Reorder commands in ORA get via SSH. Fixes [#7214](https://github.com/datalad/datalad/issues/7214) via [PR #7215](https://github.com/datalad/datalad/pull/7215) (by [@mslw](https://github.com/mslw)) | |||
Member
There was a problem hiding this comment.
Suggested change
| - Reorder commands in ORA get via SSH. Fixes [#7214](https://github.com/datalad/datalad/issues/7214) via [PR #7215](https://github.com/datalad/datalad/pull/7215) (by [@mslw](https://github.com/mslw)) | |
| - Fix a bug when retrieving several files from a RIA store via SSH, when the annex key does not contain size information. Fixes [#7214](https://github.com/datalad/datalad/issues/7214) via [PR #7215](https://github.com/datalad/datalad/pull/7215) (by [@mslw](https://github.com/mslw)) |
Contributor
Author
There was a problem hiding this comment.
You were too fast, I was editing the changelog offline :/ I like the brevity of yours better, I will make an update.
Contributor
Author
|
Reworded the changelog for brevity, and pushed an amended commit. Now I'm done :) |
Codecov ReportBase: 88.91% // Head: 90.93% // Increases project coverage by
Additional details and impacted files@@ Coverage Diff @@
## maint #7215 +/- ##
==========================================
+ Coverage 88.91% 90.93% +2.02%
==========================================
Files 355 355
Lines 46694 46694
Branches 6355 6355
==========================================
+ Hits 41516 42462 +946
+ Misses 5163 4217 -946
Partials 15 15
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. ☔ View full report at Codecov. |
bpoldrack
approved these changes
Dec 6, 2022
Collaborator
|
PR released in |
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 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.
This delays the remote-end
catcommand until just before its output is needed, for two reasons:getdecides to use scpcatoutput would remain in standard output and would be read when checking whether the next file exists (i.e. when trying to parse a completely different output), crashing upondecode().Fixes #7214