Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(docker): remove NopCloser from the executor. See #2261 #2345

Merged
merged 1 commit into from
Mar 3, 2020

Conversation

tcolgate
Copy link
Contributor

@tcolgate tcolgate commented Mar 3, 2020

This ensure that we properly close both stdout and stderr pipes after
executing docker logs.

Checklist:

  • Either (a) I've created an enhancement proposal and discussed it with the community, (b) this is a bug fix, or (c) this is a chore.
  • The title of the PR is (a) conventional, (b) states what changed, and (c) suffixes the related issues number. E.g. "fix(controller): Updates such and such. Fixes #1234".
  • I have written unit and/or e2e tests for my change. PRs without these are unlike to be merged.
  • Optional. I've added My organization is added to the README.
  • I've signed the CLA and required builds are green.

This ensure that we properly close both stdout and stderr pipes after
executing docker logs.
@tcolgate
Copy link
Contributor Author

tcolgate commented Mar 3, 2020

This is an attempt to resolve #2261.
I'm not sure this is actually the cause, but this seems more correct regardless.

@tcolgate tcolgate changed the title docker: remove NopCloser from the executor. fix(docker): remove NopCloser from the executor. Mar 3, 2020
@alexec alexec linked an issue Mar 3, 2020 that may be closed by this pull request
4 tasks
@alexec alexec changed the title fix(docker): remove NopCloser from the executor. fix(docker): remove NopCloser from the executor. See #2261 Mar 3, 2020
@alexec
Copy link
Contributor

alexec commented Mar 3, 2020

I've re-triggered this CI workflow, as it maybe flakey.

@alexec
Copy link
Contributor

alexec commented Mar 3, 2020

This should probably be backported to v2.6.0.

@alexec alexec modified the milestones: v2.6, v2.7 Mar 3, 2020
@codecov
Copy link

codecov bot commented Mar 3, 2020

Codecov Report

Merging #2345 into master will decrease coverage by 0.08%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2345      +/-   ##
==========================================
- Coverage   13.38%   13.29%   -0.09%     
==========================================
  Files          70       72       +2     
  Lines       24232    24602     +370     
==========================================
+ Hits         3244     3272      +28     
- Misses      20579    20917     +338     
- Partials      409      413       +4     
Impacted Files Coverage Δ
workflow/validate/validate.go 74.57% <0.00%> (-0.85%) ⬇️
workflow/cron/controller.go 0.00% <0.00%> (ø)
workflow/cron/operator.go 12.92% <0.00%> (ø)
workflow/controller/operator.go 61.86% <0.00%> (+0.45%) ⬆️
workflow/controller/exec_control.go 28.04% <0.00%> (+2.43%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update d8a9ea0...4f6fef6. Read the comment docs.

@alexec alexec merged commit 7ae4ec7 into argoproj:master Mar 3, 2020
alexec pushed a commit that referenced this pull request Mar 4, 2020
@alexec
Copy link
Contributor

alexec commented Mar 4, 2020

Cherry-picked to `release-2.6' for v2.6.1.

@alexec alexec modified the milestones: v2.7, v2.6 Mar 4, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Wait container stuck in multi-root workflows in 2.5-rc8 to 2.5.0
2 participants