Skip to content

ctr: fix potential panic in metric#2740

Merged
estesp merged 1 commit intocontainerd:masterfrom
Ace-Tang:ctr_metric
Oct 23, 2018
Merged

ctr: fix potential panic in metric#2740
estesp merged 1 commit intocontainerd:masterfrom
Ace-Tang:ctr_metric

Conversation

@Ace-Tang
Copy link
Copy Markdown
Contributor

Signed-off-by: Ace-Tang [email protected]

Found problem when test with containerd-shim-kata-v2, pointer should be judged whether is null.

@crosbymichael
Copy link
Copy Markdown
Member

Hum, i wonder why travis did not run...

@ijc
Copy link
Copy Markdown
Contributor

ijc commented Oct 22, 2018

Hum, i wonder why travis did not run...

Probably because GH webhooks are paused (see: https://status.github.com/messages).

@codecov-io
Copy link
Copy Markdown

codecov-io commented Oct 23, 2018

Codecov Report

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

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2740      +/-   ##
==========================================
- Coverage   47.44%   40.92%   -6.52%     
==========================================
  Files          91       69      -22     
  Lines        8406     9380     +974     
==========================================
- Hits         3988     3839     -149     
- Misses       3695     4984    +1289     
+ Partials      723      557     -166
Flag Coverage Δ
#linux ?
#windows 40.92% <ø> (?)
Impacted Files Coverage Δ
snapshots/native/native.go 1.78% <0%> (-51.52%) ⬇️
metadata/snapshot.go 21.53% <0%> (-33.23%) ⬇️
archive/tar.go 16.99% <0%> (-33.01%) ⬇️
content/local/writer.go 56.86% <0%> (-7.34%) ⬇️
metadata/containers.go 47.97% <0%> (-6.62%) ⬇️
content/local/store.go 48.51% <0%> (-5.03%) ⬇️
remotes/docker/resolver.go 58.36% <0%> (-4.99%) ⬇️
archive/tar_opts.go 28.57% <0%> (-4.77%) ⬇️
archive/compression/compression.go 58.69% <0%> (-4.7%) ⬇️
metadata/images.go 58.46% <0%> (-4.7%) ⬇️
... and 87 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update a4b6522...c3cac72. Read the comment docs.

Copy link
Copy Markdown
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

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

LGTM

@estesp estesp merged commit 52893fb into containerd:master Oct 23, 2018
@Ace-Tang Ace-Tang deleted the ctr_metric branch October 24, 2018 07:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants