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: evaluate finish time of container in CRI correctly #1183

Merged
merged 1 commit into from
Apr 23, 2018

Conversation

YaoZengzeng
Copy link
Contributor

Signed-off-by: YaoZengzeng yaozengzeng@zju.edu.cn

Ⅰ. Describe what this PR did

fixes problem mentioned in #1144

Ⅱ. 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/XS labels Apr 23, 2018
if finishedAt != 0 {
finishTime, err := time.Parse(utils.TimeLayout, container.State.FinishedAt)
if err != nil {
return nil, fmt.Errorf("failed to parse container finish time: %v", err)
Copy link
Collaborator

Choose a reason for hiding this comment

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

How about add the raw data in the error massage:

fmt.Errorf("failed to parse container finish time %s: %v",  container.State.FinishedA, err)

Signed-off-by: YaoZengzeng <yaozengzeng@zju.edu.cn>
@codecov-io
Copy link

Codecov Report

Merging #1183 into master will decrease coverage by <.01%.
The diff coverage is 0%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1183      +/-   ##
==========================================
- Coverage   15.96%   15.95%   -0.01%     
==========================================
  Files         176      176              
  Lines       10135    10138       +3     
==========================================
  Hits         1618     1618              
- Misses       8399     8402       +3     
  Partials      118      118
Impacted Files Coverage Δ
daemon/mgr/cri.go 0% <0%> (ø) ⬆️

@allencloud
Copy link
Collaborator

LGTM

@pouchrobot pouchrobot added the LGTM one maintainer or community participant agrees to merge the pull reuqest. label Apr 23, 2018
@allencloud allencloud merged commit 738c19d into AliyunContainerService:master Apr 23, 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