Skip to content

Add NewDirectIOWithTerminal#2310

Merged
crosbymichael merged 1 commit intocontainerd:masterfrom
ehazlett:directio-with-terminal
Apr 25, 2018
Merged

Add NewDirectIOWithTerminal#2310
crosbymichael merged 1 commit intocontainerd:masterfrom
ehazlett:directio-with-terminal

Conversation

@ehazlett
Copy link
Copy Markdown
Member

@ehazlett ehazlett commented Apr 25, 2018

This adds NewDirectIOWithTerminal as well as a test for PTY (TestContainerPTY) to test that output has control codes.

Refs: #2307

@dmcgowan
Copy link
Copy Markdown
Member

dmcgowan commented Apr 25, 2018

LGTM

crosbymichael
crosbymichael reviewed Apr 25, 2018
View reviewed changes
Comment thread container_linux_test.go Outdated
Copy link
Copy Markdown
Member

@crosbymichael crosbymichael Apr 25, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this needs a direct.Wait() or close to fix the race. You can test locally with go test -c -race

@dmcgowan
Copy link
Copy Markdown
Member

dmcgowan commented Apr 25, 2018

The tests failed with a data race, but not quite sure I understand what is racing though. Restarted but captured the race stack in this gist https://gist.github.com/dmcgowan/674b2dd6c3dfcce3fe54b565f5ce1ba2

@crosbymichael
Copy link
Copy Markdown
Member

crosbymichael commented Apr 25, 2018

@dmcgowan io will race if you try to read from the buffer if the process hasn't finished flushing

@ehazlett ehazlett force-pushed the directio-with-terminal branch from a4bf17b to 6b4355d Compare April 25, 2018 20:17
@ehazlett
Copy link
Copy Markdown
Member Author

ehazlett commented Apr 25, 2018

@dmcgowan thanks for the gist. i've updated to fix the race. thx!

@codecov-io
Copy link
Copy Markdown

codecov-io commented Apr 25, 2018 •
edited
Loading

Codecov Report

Merging #2310 into master will decrease coverage by 0.02%.
The diff coverage is 0%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2310      +/-   ##
==========================================
- Coverage   45.54%   45.51%   -0.03%     
==========================================
  Files          83       83              
  Lines        9185     9190       +5     
==========================================
  Hits         4183     4183              
- Misses       4326     4331       +5     
  Partials      676      676
Flag Coverage Δ
#linux 50.04% <0%> (-0.04%) ⬇️
#windows 41.24% <ø> (ø) ⬆️
Impacted Files Coverage Δ
cio/io_unix.go 70.65% <0%> (-4.07%) ⬇️

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 1a5e0df...6b4355d. Read the comment docs.

@crosbymichael
Copy link
Copy Markdown
Member

crosbymichael commented Apr 25, 2018

LGTM

@crosbymichael crosbymichael merged commit a70e26c into containerd:master Apr 25, 2018
@dmcgowan
Copy link
Copy Markdown
Member

dmcgowan commented Jun 1, 2018

Found this PR introduces a bug. Clients which were calling NewDirectIO before and had Terminal set correctly, will not have Terminal overwritten to false. The solution would be have NewDirectIO use the Terminal value instead of false, or get rid of the WithTerminal option have the caller set the fifo Terminal value before calling NewDirectIO

@dmcgowan dmcgowan mentioned this pull request Jun 1, 2018
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@crosbymichael crosbymichael crosbymichael left review comments

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@ehazlett @dmcgowan @crosbymichael @codecov-io