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

fix: make container state in inpsect API correct #2256

Merged
merged 1 commit into from
Sep 21, 2018

Conversation

allencloud
Copy link
Collaborator

@allencloud allencloud commented Sep 19, 2018

Signed-off-by: Allen Sun [email protected]

Ⅰ. Describe what this PR did

like #2255 mentioned, inspect API should return pid of exit process. Also it will show lots of fields without ignoring them, like:

        "State": {
            "Dead": false,
            "Error": "",
            "ExitCode": 143,
            "FinishedAt": "2018-09-19T10:41:37.070677153Z",
            "OOMKilled": false,
            "Paused": false,
            "Pid": 0,
            "Restarting": false,
            "Running": false,
            "StartedAt": "2018-09-19T10:41:29.770644983Z",
            "Status": "stopped"
        },

Ⅱ. Does this pull request fix one issue?

link #2255

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

added

Ⅳ. Describe how to verify it

none

Ⅴ. Special notes for reviews

@codecov
Copy link

codecov bot commented Sep 19, 2018

Codecov Report

Merging #2256 into master will decrease coverage by 0.07%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2256      +/-   ##
==========================================
- Coverage   66.84%   66.77%   -0.08%     
==========================================
  Files         208      208              
  Lines       16926    16926              
==========================================
- Hits        11314    11302      -12     
- Misses       4256     4262       +6     
- Partials     1356     1362       +6
Flag Coverage Δ
#criv1alpha1test 32.53% <ø> (-0.19%) ⬇️
#criv1alpha2test 36.05% <ø> (+0.07%) ⬆️
#integrationtest 39.54% <ø> (+0.04%) ⬆️
#nodee2etest 33.45% <ø> (-0.05%) ⬇️
#unittest 23.75% <ø> (ø) ⬆️
Impacted Files Coverage Δ
ctrd/watch.go 75.75% <0%> (-4.55%) ⬇️
daemon/containerio/cri_log_file.go 84.31% <0%> (-3.93%) ⬇️
daemon/mgr/system.go 76.22% <0%> (-1.64%) ⬇️
daemon/mgr/spec_linux.go 74.47% <0%> (-1.51%) ⬇️
cri/v1alpha2/cri_wrapper.go 61.2% <0%> (-1.2%) ⬇️
cri/v1alpha2/cri.go 66.76% <0%> (-0.6%) ⬇️
cri/v1alpha1/cri.go 61.52% <0%> (-0.34%) ⬇️
daemon/mgr/container.go 57.39% <0%> (-0.21%) ⬇️
ctrd/container.go 59.76% <0%> (+0.95%) ⬆️
daemon/mgr/container_utils.go 84.33% <0%> (+1.2%) ⬆️
... and 2 more

@pouchrobot pouchrobot added kind/bug This is bug report for project size/XL labels Sep 19, 2018
@allencloud allencloud force-pushed the fix-state branch 2 times, most recently from 37e6618 to efccf91 Compare September 19, 2018 14:35
Copy link
Contributor

@fuweid fuweid left a comment

Choose a reason for hiding this comment

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

LGTM but wait for CI

@fuweid fuweid merged commit 0e0035f into AliyunContainerService:master Sep 21, 2018
@allencloud allencloud deleted the fix-state branch September 21, 2018 01:50
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 size/XL
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants