Skip to content

Conversation

@zhuangqh
Copy link
Contributor

Ⅰ. Describe what this PR did

remove fifo path if stdio is not initail

Ⅱ. Does this pull request fix one issue?

NONE

Ⅲ. Why don't you add test cases (unit test/integration test)? (你真的觉得不需要加测试吗?)

Ⅳ. Describe how to verify it

Ⅴ. Special notes for reviews

@codecov
Copy link

codecov bot commented Oct 10, 2018

Codecov Report

Merging #2302 into master will increase coverage by 1.33%.
The diff coverage is 0%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2302      +/-   ##
==========================================
+ Coverage   66.61%   67.95%   +1.33%     
==========================================
  Files         211      217       +6     
  Lines       17195    19972    +2777     
==========================================
+ Hits        11455    13572    +2117     
- Misses       4337     4838     +501     
- Partials     1403     1562     +159
Flag Coverage Δ
#criv1alpha1test 33.2% <0%> (+1.21%) ⬆️
#criv1alpha2test 38.31% <0%> (+2.66%) ⬆️
#integrationtest 42.25% <0%> (+2.66%) ⬆️
#nodee2etest 35.72% <0%> (+2.7%) ⬆️
#unittest 21.8% <0%> (-1.68%) ⬇️
Impacted Files Coverage Δ
daemon/containerio/cio.go 61.53% <0%> (-0.97%) ⬇️
daemon/mgr/container_types.go 76.96% <0%> (-6.67%) ⬇️
daemon/mgr/snapshot.go 89.85% <0%> (-4.35%) ⬇️
cri/ocicni/cni_manager.go 77.46% <0%> (-2.54%) ⬇️
daemon/logger/jsonfile/utils.go 71.54% <0%> (-1.63%) ⬇️
ctrd/client_opts.go 49.2% <0%> (-0.8%) ⬇️
daemon/mgr/spec_hook.go 24% <0%> (-0.57%) ⬇️
cri/v1alpha2/cri_wrapper.go 62.4% <0%> (ø) ⬆️
apis/metrics/metrics.go 100% <0%> (ø) ⬆️
storage/quota/grpquota.go 0% <0%> (ø) ⬆️
... and 38 more

@pouchrobot
Copy link
Collaborator

@zhuangqh Thanks for your contribution. 🍻
Please sign off in each of your commits.

@Ace-Tang
Copy link
Contributor

Just for the logic, LGTM

@pouchrobot pouchrobot added the LGTM one maintainer or community participant agrees to merge the pull reuqest. label Oct 10, 2018
// judge stdin is initial, make logic same with copyIO.
if i, ok := stdin.(*ContainerIO); (ok && i == nil) || (stdin == nil) {
paths.In = ""
}
Copy link
Contributor

Choose a reason for hiding this comment

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

I just wonder if this code is need here, code not so good.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@Ace-Tang What did you concern about? Maybe we should use reflect.ValueOf(stdin).IsNil() to check whether stdin is nil?

@zhuangqh zhuangqh changed the title remove fifo path if stdio is not initail fix: remove fifo path if stdio is not initail Oct 10, 2018
@pouchrobot pouchrobot added the kind/bug This is bug report for project label Oct 10, 2018
@zhuangqh
Copy link
Contributor Author

There is a mechanism to promise paths.In == "" if stdin is not initial. closed. @Ace-Tang

@zhuangqh zhuangqh closed this Oct 10, 2018
@allencloud allencloud reopened this Oct 17, 2018
@allencloud
Copy link
Collaborator

LGTM

@allencloud allencloud merged commit 1e71757 into AliyunContainerService:master Oct 18, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

kind/bug This is bug report for project LGTM one maintainer or community participant agrees to merge the pull reuqest. size/XS

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants