Skip to content

Fix creation of DirectIO overwriting fifo config#2379

Merged
estesp merged 1 commit intocontainerd:masterfrom
dmcgowan:fix-direct-io-terminal-setting
Jun 2, 2018
Merged

Fix creation of DirectIO overwriting fifo config#2379
estesp merged 1 commit intocontainerd:masterfrom
dmcgowan:fix-direct-io-terminal-setting

Conversation

@dmcgowan
Copy link
Copy Markdown
Member

@dmcgowan dmcgowan commented Jun 1, 2018

Creating a direct IO should not overwrite the fifo configuration. The fifo configuration can be updated
before creating the direct io if needed. This fixes an unexpected change in behavior for clients who were calling NewDirectIO previously with terminal configured on the fifo.

This reverts the non-test code change from #2310 with an alternate solution in the test which just configures the fifos with the terminal setting.

Creating a direct IO should not overwrite the fifo
configuration. The fifo configuration can be updated
before creating the direct io if needed.
This fixes an expected change in behavior for clients
who were calling NewDirectIO previously with terminal
configured on the fifo.

Signed-off-by: Derek McGowan <[email protected]>
@codecov-io
Copy link
Copy Markdown

Codecov Report

Merging #2379 into master will increase coverage by 0.02%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2379      +/-   ##
==========================================
+ Coverage   45.03%   45.06%   +0.02%     
==========================================
  Files          92       92              
  Lines        9390     9385       -5     
==========================================
  Hits         4229     4229              
+ Misses       4478     4473       -5     
  Partials      683      683
Flag Coverage Δ
#linux 49.29% <ø> (+0.03%) ⬆️
#windows 41.32% <ø> (ø) ⬆️
Impacted Files Coverage Δ
cio/io_unix.go 74.71% <ø> (+4.06%) ⬆️

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 5b1f69b...6b9be1b. Read the comment docs.

@crosbymichael
Copy link
Copy Markdown
Member

LGTM

1 similar comment
@ehazlett
Copy link
Copy Markdown
Member

ehazlett commented Jun 2, 2018

LGTM

Copy link
Copy Markdown
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

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

LGTM

@estesp estesp merged commit 84bebdd into containerd:master Jun 2, 2018
@dmcgowan dmcgowan deleted the fix-direct-io-terminal-setting branch June 5, 2018 18:18
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.

5 participants