Skip to content
This repository has been archived by the owner on May 12, 2021. It is now read-only.

vendor: Update github.com/kata-containers/agent #2285

Merged
merged 1 commit into from
Dec 16, 2019
Merged

vendor: Update github.com/kata-containers/agent #2285

merged 1 commit into from
Dec 16, 2019

Conversation

teawater
Copy link
Member

@teawater teawater commented Nov 29, 2019 •
edited
Loading

Update github.com/kata-containers/agent to
introduce fix of hybrid vsock.

Fixes: #2284

Signed-off-by: Hui Zhu teawater@antfin.com

@teawater
Copy link
Member Author

/test

@lifupan
Copy link
Member

lifupan commented Nov 29, 2019

Hi @teawater ,
I think need to add a summary of range of commits being added for these third-party packages in commit message.
Please refer https://github.com/kata-containers/community/blob/master/CONTRIBUTING.md#re-vendor-prs .

jodh-intel
jodh-intel reviewed Nov 29, 2019
View reviewed changes
Copy link
Contributor

@jodh-intel jodh-intel left a comment

Choose a reason for hiding this comment

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

Hi @teawater,

Thanks for raising. Please can you update the commit message to add details of the commits this PR adds for the vendored code added as explained in https://github.com/kata-containers/community/blob/5890c2064e3d62502e259674b06cf456164cd381/CONTRIBUTING.md#re-vendor-prs

@codecov
Copy link

codecov bot commented Nov 29, 2019 •
edited
Loading

Codecov Report

❗ No coverage uploaded for pull request base (master@39d7a14). Click here to learn what that means.
The diff coverage is n/a.

@@            Coverage Diff            @@
##             master    #2285   +/-   ##
=========================================
  Coverage          ?   54.41%           
=========================================
  Files             ?       45           
  Lines             ?     4618           
  Branches          ?        0           
=========================================
  Hits              ?     2513           
  Misses            ?     1901           
  Partials          ?      204

@teawater teawater added the do-not-merge PR has problems or depends on another label Nov 30, 2019
@teawater
Copy link
Member Author

I found that there is another issue should be fix about fc. I will update curent PR later.

@teawater teawater removed the do-not-merge PR has problems or depends on another label Dec 4, 2019
@teawater
Copy link
Member Author

teawater commented Dec 4, 2019

@lifupan @jodh-intel Thanks for your remind. I pushed a new commit according to your comments.

@teawater
Copy link
Member Author

teawater commented Dec 4, 2019

/test

@egernst
Copy link
Member

egernst commented Dec 4, 2019

Wondering about this failure:

not ok 31 ctr with default list of capabilities from crio.conf
# (in test file ctr.bats, line 1064)
#   `[ "$status" -eq 0 ]' failed
# time="2019-12-04T15:04:57Z" level=error msg="File descriptor 3 (pipe:[3799975]) leaked on pvdisplay invocation. Parent PID 30107: /tmp/jenkins/workspace/kata-con\nFile descriptor 6 (/dev/mapper/control) leaked on pvdisplay invocation. Parent PID 30107: /tmp/jenkins/workspace/kata-con\n  Failed to find physical volume \"/dev/sdb\".\n" error="exit status 5"
# 0

@teawater
Copy link
Member Author

teawater commented Dec 5, 2019

jenkins-ci-ubuntu-1804-firecracker failed:

#   `[ "$status" -eq 0 ]' failed
# time="2019-12-05T04:31:54Z" level=error msg="File descriptor 3 (pipe:[2961050]) leaked on pvdisplay invocation. Parent PID 27856: /tmp/jenkins/workspace/kata-con\nFile descriptor 6 (/dev/mapper/control) leaked on pvdisplay invocation. Parent PID 27856: /tmp/jenkins/workspace/kata-con\n  Failed to find physical volume \"/dev/sdb\".\n" error="exit status 5"
# 0
# time="2019-12-05 04:32:08.868841497Z" level=debug msg="found valid runtime \"runc\" for runtime_path \"/usr/local/bin/kata-runtime\"" file="config/config.go:803"
# time="2019-12-05 04:32:08.868962200Z" level

I think it doesn't have relation with this PR.

gnawux
gnawux approved these changes Dec 5, 2019
View reviewed changes
Copy link
Member

@gnawux gnawux left a comment

Choose a reason for hiding this comment

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

looks good

@teawater teawater added the do-not-merge PR has problems or depends on another label Dec 5, 2019
@teawater
Copy link
Member Author

teawater commented Dec 5, 2019

jenkins-ci-ubuntu-1804-firecracker failed a lot of times with different fails.
And http://jenkins.katacontainers.io/job/kata-containers-runtime-ubuntu-1804-PR-firecracker/1305/ got success after these fails. So I think maybe there are something not right in this PR.

I worried that it has relation with the big update of golang.org/x/sys that is need by github.com/kata-containers/agent.

@teawater
Copy link
Member Author

teawater commented Dec 5, 2019

/test

@teawater
Copy link
Member Author

teawater commented Dec 5, 2019

/test

@teawater
Copy link
Member Author

teawater commented Dec 5, 2019

/test

@teawater teawater removed the do-not-merge PR has problems or depends on another label Dec 5, 2019
@teawater teawater added the do-not-merge PR has problems or depends on another label Dec 6, 2019
@teawater
Copy link
Member Author

teawater commented Dec 6, 2019

/test

@teawater
Copy link
Member Author

/test

@teawater teawater force-pushed the update_a branch 2 times, most recently from a537453 to 6ee3c9f Compare December 11, 2019 03:07
@teawater
Copy link
Member Author

/test

@teawater teawater mentioned this pull request Dec 11, 2019
Closed
teawater added a commit to teawater/agent that referenced this pull request Dec 11, 2019
@teawater
client.go: HybridVSockDialer: Close dup fd after receive packet
33f3208 
kata runtime jenkins-ci-ubuntu-1804-firecracker always failed when agent
of vendor is updated to new version in
kata-containers/runtime#2285.

This test passed after added code to close dup fd after receive packet
in http://jenkins.katacontainers.io/job/kata-containers-runtime-ubuntu-1804-PR-firecracker/1339/.

Fixes: kata-containers#703

Signed-off-by: Hui Zhu <teawater@antfin.com>
@teawater teawater mentioned this pull request Dec 11, 2019
Merged
@teawater teawater removed the do-not-merge PR has problems or depends on another label Dec 12, 2019
@teawater
Copy link
Member Author

/test

@teawater
Copy link
Member Author

/test

@teawater
Copy link
Member Author

/retest

@gnawux
Copy link
Member

gnawux commented Dec 14, 2019

/test

@teawater teawater mentioned this pull request Dec 15, 2019
Merged
@teawater teawater added the do-not-merge PR has problems or depends on another label Dec 15, 2019
@teawater teawater changed the title vendor: Update golang.org/x/sys and github.com/kata-containers/agent vendor: Update github.com/kata-containers/agent Dec 16, 2019
@teawater
vendor: Update github.com/kata-containers/agent to handle hvsock issue
a215f87 
Update github.com/kata-containers/agent to handle hvsock issue.

Shortlog:
    33f3208 client.go: HybridVSockDialer: Close dup fd after receive packet
    74a3b95 release: Kata Containers 1.10.0-rc0
    afd0871 ci: install docker before configure
    c502552 client.go: HybridVSockDialer: Check return size n of unix.Recvfrom
    f8e4ce8 client.go: HybridVSockDialer: Change Read EOT to recv peek
    5b64d42 agent: get current cpuset from /sys/devices/system/cpu/online
    183a24a release: Kata Containers 1.10.0-alpha1
    1ee8516 config: add option to control hotplug timeout of block devices
    40567f6 release: Kata Containers 1.10.0-alpha0
    19bee57 agent: connect debugging console in a specific vsock port
    8361150 docs: Add enable services and installation steps for TRACING.md
    a4f7373 agent: fix pause bin on musl
    f9f129a docs: Add missing steps at TRACING.md
    d3e66bf tracing: Wrapper for tracing functions
    7a7dba7 network: ensure parent directories exist
    455f728 tracing: Generate an alias for opentracing.Span
    5f302e5 agent: Revert "client: remove the parameter of 'enableYamux'"
    717ee24 client: remove the parameter of 'enableYamux'
    d387c77 vendor: Update github.com/syndtr/gocapability/capability
    b3d737b vendor: update libcontainer to 1.0.0-rc9
    6eac713 release: Kata Containers 1.9.0-rc0

Fixes: kata-containers#2284

Signed-off-by: Hui Zhu <teawater@antfin.com>
@teawater teawater removed the do-not-merge PR has problems or depends on another label Dec 16, 2019
@teawater
Copy link
Member Author

/test

@bergwolf bergwolf merged commit 3de4bdd into kata-containers:master Dec 16, 2019
@Pennyzct Pennyzct mentioned this pull request Jan 10, 2020
Merged
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@jodh-intel jodh-intel jodh-intel left review comments

@amshinde amshinde amshinde approved these changes

@gnawux gnawux gnawux approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Rust agent(grpc-rs) cannot work with firecacker hybrid vsock
7 participants
@teawater @lifupan @egernst @gnawux @amshinde @jodh-intel @bergwolf