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

ctrd: support to show shim log #2809

Merged
merged 1 commit into from
Apr 23, 2019
Merged

ctrd: support to show shim log #2809

merged 1 commit into from
Apr 23, 2019

Conversation

fuweid
Copy link
Contributor

@fuweid fuweid commented Apr 23, 2019

Signed-off-by: Wei Fu fuweid89@gmail.com

Ⅰ. Describe what this PR did

support to get shim log into pouch log if the debug mode is open.

Ⅱ. Does this pull request fix one issue?

none

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

no need

Ⅳ. Describe how to verify it

CI

Ⅴ. Special notes for reviews

Signed-off-by: Wei Fu <fuweid89@gmail.com>
@codecov
Copy link

codecov bot commented Apr 23, 2019

Codecov Report

Merging #2809 into master will decrease coverage by 0.04%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2809      +/-   ##
==========================================
- Coverage   69.39%   69.35%   -0.05%     
==========================================
  Files         278      278              
  Lines       17389    17397       +8     
==========================================
- Hits        12067    12065       -2     
- Misses       3978     3983       +5     
- Partials     1344     1349       +5
Flag Coverage Δ
#criv1alpha2_test 39.3% <0%> (+0.05%) ⬆️
#integration_test_0 36.54% <100%> (+0.02%) ⬆️
#integration_test_1 35.33% <100%> (-0.03%) ⬇️
#integration_test_2 36.51% <100%> (-0.07%) ⬇️
#integration_test_3 35.38% <100%> (-0.03%) ⬇️
#node_e2e_test 35% <0%> (-0.11%) ⬇️
#unittest 28.69% <0%> (-0.01%) ⬇️
Impacted Files Coverage Δ
ctrd/supervisord/option.go 70.37% <100%> (+10.37%) ⬆️
daemon/daemon.go 69.89% <100%> (+0.15%) ⬆️
ctrd/watch.go 72.97% <0%> (-5.41%) ⬇️
daemon/mgr/container_utils.go 81.81% <0%> (-1.71%) ⬇️
pkg/meta/store.go 67.44% <0%> (-1.56%) ⬇️
daemon/mgr/container.go 59.41% <0%> (-0.85%) ⬇️
cri/v1alpha2/cri.go 71.09% <0%> (+0.25%) ⬆️
ctrd/container.go 54.64% <0%> (+0.37%) ⬆️
daemon/mgr/spec_linux.go 80.07% <0%> (+1.06%) ⬆️

@rudyfly
Copy link
Collaborator

rudyfly commented Apr 23, 2019

LGTM

@pouchrobot pouchrobot added the LGTM one maintainer or community participant agrees to merge the pull reuqest. label Apr 23, 2019
@rudyfly rudyfly merged commit 4ad5f91 into AliyunContainerService:master Apr 23, 2019
@fuweid fuweid deleted the me-support-shim-debug-log branch April 23, 2019 08:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
areas/log 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.

None yet

3 participants