fix: Data race in CopyPassThru #66
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 fix in bramvdbogaerde#38 was incomplete as it only moved StdoutPipe outside the goroutine, this commit also moves StdinPipe outside the goroutine so there is no race when doing Run on the session. Fixes bramvdbogaerde#39 Related to bramvdbogaerde#38
mafredri
commented
Nov 23, 2022
| @@ -157,12 +162,6 @@ func (a *Client) CopyPassThru(ctx context.Context, r io.Reader, remotePath strin | |||
|
|
|||
| go func() { | |||
| defer wg.Done() | |||
| w, err := a.Session.StdinPipe() | |||
There was a problem hiding this comment.
This issue is easy to reproduce by adding a time.Sleep(time.Second) above.
mafredri
added a commit
to coder/coder
that referenced
this pull request
Dec 19, 2022
Attempt to upstream: bramvdbogaerde/go-scp#66
|
Merged! Thank you for your contribution. |
mudler
referenced
this pull request
in kairos-io/provider-kairos
Feb 7, 2023
[](https://renovatebot.com) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/bramvdbogaerde/go-scp](https://togithub.com/bramvdbogaerde/go-scp) | require | patch | `v1.2.0` -> `v1.2.1` | --- ### Release Notes <details> <summary>bramvdbogaerde/go-scp</summary> ### [`v1.2.1`](https://togithub.com/bramvdbogaerde/go-scp/releases/tag/v1.2.1): Version 1.2.1 [Compare Source](https://togithub.com/bramvdbogaerde/go-scp/compare/v1.2.0...v1.2.1) #### What's Changed - Some code style fixes by [@​dshemin](https://togithub.com/dshemin) in [https://github.com/bramvdbogaerde/go-scp/pull/53](https://togithub.com/bramvdbogaerde/go-scp/pull/53) - fix: CopyRemotePassThru blocked on writing to error channel by [@​262nos](https://togithub.com/262nos) in [https://github.com/bramvdbogaerde/go-scp/pull/56](https://togithub.com/bramvdbogaerde/go-scp/pull/56) - fix: Data race in CopyPassThru by [@​mafredri](https://togithub.com/mafredri) in [https://github.com/bramvdbogaerde/go-scp/pull/66](https://togithub.com/bramvdbogaerde/go-scp/pull/66) #### New Contributors - [@​262nos](https://togithub.com/262nos) made their first contribution in [https://github.com/bramvdbogaerde/go-scp/pull/56](https://togithub.com/bramvdbogaerde/go-scp/pull/56) - [@​mafredri](https://togithub.com/mafredri) made their first contribution in [https://github.com/bramvdbogaerde/go-scp/pull/66](https://togithub.com/bramvdbogaerde/go-scp/pull/66) **Full Changelog**: bramvdbogaerde/go-scp@v1.2.0...v1.2.1 </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/kairos-io/provider-kairos). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNC44MS4wIiwidXBkYXRlZEluVmVyIjoiMzQuMTA4LjEifQ==--> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
](https://renovatebot.com){kind=link}
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 fix in #38 was incomplete as it only moved StdoutPipe outside the
goroutine, this commit also moves StdinPipe outside the goroutine so
there is no race when doing Run on the session.
Fixes #39
Related to #38