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

stable-1.10 backports#2619

Merged
chavafg merged 6 commits into
kata-containers:stable-1.10from
chavafg:stable-1.10
Apr 17, 2020
Merged

stable-1.10 backports#2619
chavafg merged 6 commits into
kata-containers:stable-1.10from
chavafg:stable-1.10

Conversation

@chavafg
Copy link
Copy Markdown
Contributor

@chavafg chavafg commented Apr 15, 2020

Commits backported:
v2: Open log fifo with RDWR instead of WRONLYffa090a
qemu: Don't crash if virtiofsd path is non existent … cbfb3a4
virtcontainers: Don't create vfio devices in the guest … 11838d0

darfux and others added 2 commits April 15, 2020 11:47
The container log fifo is opened as `O_WRONLY` now. When the read side
of fifo is closed temporarily such as restarting contaienrd, write to
`tty.Stdout` will get an EPIPE error and finally cause `io.CopyBuffer`
return. Then `ioCopy` closes the tty io and exits. Thus after containerd
restarted, the log fifo can't be reopened. The container will be blocked
forever after stdout/stderr buffer is full.

Opening the log fifo with `RDWR` instead of `WRONLY` avoids the fifo
returning EPIPE when the read side is closed, and keeps the fifo open
until the reader reopening it.

Fixes: kata-containers#2590

Signed-off-by: Li Yuxuan <liyuxuan04@baidu.com>
(cherry picked from commit 8e0f891)
Instead, report an error and exit gracefully, as shown below:
```
dahmer fidencio # podman run -ti --runtime=/usr/bin/kata-runtime fedora sh
Error: virtiofsd path (/usr/libexec/virtiofsd) does not exist: OCI runtime error
```

Fixes: kata-containers#2582

Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
(cherry picked from commit fd625b3)
Copy link
Copy Markdown
Member

@fidencio fidencio left a comment

Choose a reason for hiding this comment

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

lgtm

vfio devices hotplugged in the VM are expected to be handled by the kernel
driver in the guest, hence the char vfio devices shouldn't appear in the
container under /dev/vfio/.

fixes kata-containers#2539

Signed-off-by: Julio Montes <julio.montes@intel.com>
(cherry picked from commit 4d2574a)
@chavafg
Copy link
Copy Markdown
Contributor Author

chavafg commented Apr 15, 2020

/test

@codecov
Copy link
Copy Markdown

codecov Bot commented Apr 15, 2020

Codecov Report

Merging #2619 into stable-1.10 will increase coverage by 0.13%.
The diff coverage is 66.66%.

@@               Coverage Diff               @@
##           stable-1.10    #2619      +/-   ##
===============================================
+ Coverage        48.97%   49.11%   +0.13%     
===============================================
  Files              111      111              
  Lines            16021    16030       +9     
===============================================
+ Hits              7847     7873      +26     
+ Misses            7207     7185      -22     
- Partials           967      972       +5     

@chavafg
Copy link
Copy Markdown
Contributor Author

chavafg commented Apr 16, 2020

Seems that we will need to update to go 1.13.9 as we are hitting this issue:

19:19:42 make[1]: Entering directory '/tmp/jenkins/workspace/kata-containers-tests-cri-containerd-PR/go/src/github.com/containerd/cri'
19:19:42 🇩 _output/integration.test
19:19:42 go test -c github.com/containerd/cri/integration -o _output/integration.test
19:19:44 # github.com/containerd/cri/vendor/k8s.io/apimachinery/pkg/util/errors
19:19:44 vendor/k8s.io/apimachinery/pkg/util/errors/errors.go:99:10: undefined: errors.Is

This failure happens when trying to run the containerd tests (including shimv2).
Tried to search around and seems that the only fix is to update go version.

GabyCT pushed a commit to GabyCT/tests-1 that referenced this pull request Apr 16, 2020
With golang updated to v1.13, we found golangci-lint build error
on ARM CI.
Taking advices here(
filecoin-project/venus#3486 (comment)),
we need to update golangci-lint to v1.18.0 to get Go 1.13 support.

Fixes: kata-containers#2434

Depends-on: github.com/kata-containers/runtime#2619

Signed-off-by: Penny Zheng <penny.zheng@arm.com>
@jodh-intel
Copy link
Copy Markdown

Travis failed with the dreaded error...

INFO: Building github.com/golangci/golangci-lint
go build -o golangci-lint ./cmd/golangci-lint
go: github.com/go-critic/go-critic@v0.0.0-20181204210945-ee9bf5809ead: invalid pseudo-version: does not match version-control timestamp (2019-02-10T22:04:43Z)

Update golang to 1.13.9 in versions.yaml.
In addition, add same golang version to `.travis.yml` and
delete the call to `.ci/install_go.sh` as it started to
cause problems in travis CI.

Fixes: kata-containers#2592.

Signed-off-by: Salvador Fuentes <salvador.fuentes@intel.com>
GabyCT pushed a commit to GabyCT/tests-1 that referenced this pull request Apr 16, 2020
With golang updated to v1.13, we found golangci-lint build error
on ARM CI.
Taking advices here(
filecoin-project/venus#3486 (comment)),
we need to update golangci-lint to v1.18.0 to get Go 1.13 support.

Fixes: kata-containers#2434

Depends-on: github.com/kata-containers/runtime#2619

Signed-off-by: Penny Zheng <penny.zheng@arm.com>
@chavafg
Copy link
Copy Markdown
Contributor Author

chavafg commented Apr 16, 2020

/test

chavafg and others added 2 commits April 16, 2020 17:02
We currently use containerd v1.3.0, but this version has an
issue when running the containerd/cri tests with go 1.13.
This commit: 3a4acfbc99aa976849f51a8edd4af20ead51d8d7 from
branch release/1.3 contains the fix to be able to run the
tests with go 1.13.

Fixes: kata-containers#2562.

Signed-off-by: Salvador Fuentes <salvador.fuentes@intel.com>
(cherry picked from commit e62a8aa)
There is a typo 'emtpy' instead of 'empty' in a error message

Fixes: kata-containers#2465

Signed-off-by: Liu Xiaodong <xiaodong.liu@intel.com>
(cherry picked from commit 0f720e6)
@chavafg
Copy link
Copy Markdown
Contributor Author

chavafg commented Apr 16, 2020

/test

@chavafg chavafg merged commit 544c9cc into kata-containers:stable-1.10 Apr 17, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants