Skip to content

[release/1.2] Close socket fd#3364

Merged
fuweid merged 1 commit intocontainerd:release/1.2from
keloyang:close-socket-fd-1.2
Jun 21, 2019
Merged

[release/1.2] Close socket fd#3364
fuweid merged 1 commit intocontainerd:release/1.2from
keloyang:close-socket-fd-1.2

Conversation

@keloyang
Copy link
Copy Markdown
Contributor

Cherrypick of #3359 to release/1.2.

Signed-off-by: Shukui Yang [email protected]

containerd-shim has dup the fd 3, and it don't need fd 3 any more.

Signed-off-by: Shukui Yang <[email protected]>
@keloyang keloyang changed the title [release/1.1] Close socket fd 1.1 [release/1.1] Close socket fd Jun 21, 2019
@keloyang keloyang changed the title [release/1.1] Close socket fd [release/1.2] Close socket fd Jun 21, 2019
@fuweid
Copy link
Copy Markdown
Member

fuweid commented Jun 21, 2019

@keloyang thanks for cherry-pick. it seems that something is hang in CI.

+ integration
time="2019-06-21T07:29:17Z" level=info msg="running tests against containerd" revision=bb3ad5bc54427464946e0b0bed848bd9aacaf4c7 version=v1.2.7-9-gbb3ad5bc 
time="2019-06-21T07:29:17Z" level=info msg="start to pull seed image" 

could you please to re-push it to trigger it again? thanks

@estesp
Copy link
Copy Markdown
Member

estesp commented Jun 21, 2019

We had a flaky test failure--I just restarted the broken CI runs, so it should be ok :)

@codecov-io
Copy link
Copy Markdown

Codecov Report

Merging #3364 into release/1.2 will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff              @@
##           release/1.2    #3364   +/-   ##
============================================
  Coverage        43.81%   43.81%           
============================================
  Files              101      101           
  Lines            10780    10780           
============================================
  Hits              4723     4723           
  Misses            5321     5321           
  Partials           736      736
Flag Coverage Δ
#linux 47.44% <ø> (ø) ⬆️
#windows 40.93% <ø> (ø) ⬆️

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 5ca28c1...ed35eec. 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

Copy link
Copy Markdown
Member

@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

@fuweid fuweid merged commit 524eb23 into containerd:release/1.2 Jun 21, 2019
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.

4 participants