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

bugfix: disable mux stdout and stderr if backend is not http #1250

Merged
merged 1 commit into from
Apr 28, 2018

Conversation

YaoZengzeng
Copy link
Contributor

Signed-off-by: YaoZengzeng [email protected]

Ⅰ. Describe what this PR did

Yesterday we skip some tests of CRI.

It's so dangerous, So I make a quick fix to make it all right :)

Ⅱ. Does this pull request fix one issue?

Ⅲ. Describe how you did it

Ⅳ. Describe how to verify it

Ⅴ. Special notes for reviews

@pouchrobot pouchrobot added kind/bug This is bug report for project size/S labels Apr 28, 2018
Stdout: true,
Stderr: true,
MemBuffer: &output,
MuxDisabled: true,
}

err = c.ContainerMgr.StartExec(ctx, execid, startConfig, attachConfig)
Copy link
Contributor

Choose a reason for hiding this comment

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

can we use pipeIO to check the status? I think that the spin check is not good for the performance.

BTW, if the cmd is top, the timeout can work with the io.Copy.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, it's ugly actually, I'll make it more elegant in the future.

Thanks for your advice.

Copy link
Collaborator

@allencloud allencloud Apr 28, 2018

Choose a reason for hiding this comment

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

Could you add an issue to record this? @fuweid
Or @YaoZengzeng you to add this issue?
And thanks for the test fixing.

Copy link
Contributor

Choose a reason for hiding this comment

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

@allencloud @YaoZengzeng I will add the issue for this. Thanks

@fuweid fuweid requested a review from allencloud April 28, 2018 03:13
@codecov-io
Copy link

Codecov Report

Merging #1250 into master will increase coverage by 0.01%.
The diff coverage is 0%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1250      +/-   ##
==========================================
+ Coverage   15.27%   15.28%   +0.01%     
==========================================
  Files         172      172              
  Lines       10691    10682       -9     
==========================================
  Hits         1633     1633              
+ Misses       8938     8929       -9     
  Partials      120      120
Impacted Files Coverage Δ
daemon/mgr/container_types.go 25.31% <ø> (ø) ⬆️
daemon/containerio/container_io.go 0% <0%> (ø) ⬆️
daemon/mgr/container.go 0% <0%> (ø) ⬆️
daemon/mgr/cri.go 0% <0%> (ø) ⬆️
daemon/containerio/options.go 0% <0%> (ø) ⬆️
ctrd/container.go 0% <0%> (ø) ⬆️
daemon/mgr/cri_stream.go 0% <0%> (ø) ⬆️
daemon/config/config.go 10% <0%> (+2.1%) ⬆️

@allencloud
Copy link
Collaborator

LGTM

@pouchrobot pouchrobot added the LGTM one maintainer or community participant agrees to merge the pull reuqest. label Apr 28, 2018
@allencloud allencloud merged commit e7dab88 into AliyunContainerService:master Apr 28, 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/S
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants