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

Backports for 1.8#1882

Merged
chavafg merged 6 commits intokata-containers:stable-1.8from
egernst:backports-for-1.8
Jul 18, 2019
Merged

Backports for 1.8#1882
chavafg merged 6 commits intokata-containers:stable-1.8from
egernst:backports-for-1.8

Conversation

@egernst
Copy link
Copy Markdown
Member

@egernst egernst commented Jul 17, 2019 •
edited
Loading

The following fixes landed on master since RC0 and should be included:

c192343 virtiofs: Allow memory hotplug with virtiofs
0a18fba runtime: Disable disable-modern for virtio QMP add
0d7b981 vendor: update govmm and match code
c980da4 test: Fix fd leak causing test error
5628825 shimv2: Add missing page size to Hugetlb Stat

qemu: use x-ignore-shared to implement vm template

@egernst
Copy link
Copy Markdown
Member Author

egernst commented Jul 17, 2019

/test

grahamwhaley
grahamwhaley approved these changes Jul 17, 2019
View reviewed changes
Copy link
Copy Markdown
Contributor

@grahamwhaley grahamwhaley left a comment

Choose a reason for hiding this comment

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

lgtm

odinuge and others added 5 commits July 17, 2019 07:45
@odinuge
shimv2: Add missing page size to Hugetlb Stat
5628825 
Fixes: kata-containers#1856

Signed-off-by: Odin Ugedal <odin@ugedal.com>
test: Fix fd leak causing test error
c980da4 
Update the `TestQemuAddDeviceKataVSOCK` test so that it:

- Doesn't hard-code the file descriptor number.
- Cleans up after itself.

The latter issue was causing an odd error similar to the following in
the test output:

```
Unable to launch /tmp/vc-tmp-526112270/hypervisor: fork/exec /tmp/vc-tmp-526112270/hypervisor: permission denied
```

Partially fixes: kata-containers#1835.

Signed-off-by: James O. D. Hunt <james.o.hunt@intel.com>
vendor: update govmm and match code
0d7b981 
update govmm to support virtiofs memory hotplug
Commits:
    0c900f5 Allow sharing of memory backend file
    f695ddf qemu: add migration incoming defer support
    f0f18dd qmp: add virtio-blk multiqueue
    7d3deea qemu: Add a virtio-blk-pci device driver support

Fixes: kata-containers#1745
Signed-off-by: Ganesh Maharaj Mahalingam <ganesh.mahalingam@intel.com>
runtime: Disable disable-modern for virtio QMP add
0a18fba 
History: the previous version of kvm (unknown) and qemu-lite had an
issue using virtio 1.0 version when it came to device hotplug, which led
to the team to disable 1.0 version of virtio for hotplug (set
disable-modern=on). Please check
containers/virtcontainers@e99f6b2
for further info.

We have since moved to QEMU4.0 and probably a later version of kvm as
default across all distros. This change is to move to virtio 1.0 for
hotplugging devices.

Fixes: kata-containers#1870
Signed-off-by: Ganesh Maharaj Mahalingam <ganesh.mahalingam@intel.com>
virtiofs: Allow memory hotplug with virtiofs
c192343 
Kata with virtio-fs fails to do memory hotplugging. This is caused by
the fact that hot plugged memory is always backed by
'memory-backend-ram' while virtio-fs expects it to be backed by file and
shared for it to be able to use the system the way it is intended. This
chnage allows using file based memory backend for virtio-fs, hugepages
or when the user prefers to use a file backed memory

Fixes: kata-containers#1745
Signed-off-by: Ganesh Maharaj Mahalingam <ganesh.mahalingam@intel.com>
@codecov
Copy link
Copy Markdown

codecov bot commented Jul 17, 2019

Codecov Report

❗ No coverage uploaded for pull request base (stable-1.8@43f2680). Click here to learn what that means.
The diff coverage is 0%.

@@              Coverage Diff              @@
##             stable-1.8    #1882   +/-   ##
=============================================
  Coverage              ?   53.94%           
=============================================
  Files                 ?      106           
  Lines                 ?    13203           
  Branches              ?        0           
=============================================
  Hits                  ?     7123           
  Misses                ?     5234           
  Partials              ?      846

1 similar comment
@codecov
Copy link
Copy Markdown

codecov bot commented Jul 17, 2019

Codecov Report

❗ No coverage uploaded for pull request base (stable-1.8@43f2680). Click here to learn what that means.
The diff coverage is 0%.

@@              Coverage Diff              @@
##             stable-1.8    #1882   +/-   ##
=============================================
  Coverage              ?   53.94%           
=============================================
  Files                 ?      106           
  Lines                 ?    13203           
  Branches              ?        0           
=============================================
  Hits                  ?     7123           
  Misses                ?     5234           
  Partials              ?      846

@jcvenegas
Copy link
Copy Markdown
Member

jcvenegas commented Jul 17, 2019 

+ echo 'init vm template'
init vm template
+ sudo -E PATH=/tmp/jenkins/workspace/kata-containers-runtime-ubuntu-18-04-PR-initrd/go/bin:/usr/local/go/bin:/usr/sbin:/sbin:/tmp/jenkins/workspace/kata-containers-runtime-ubuntu-18-04-PR-initrd/go/bin:/usr/local/go/bin:/usr/sbin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games /usr/local/bin/kata-runtime factory init
QMP command failed: Invalid parameter 'bypass-shared-memory'
Makefile:150: recipe for target 'vm-factory' failed
make: *** [vm-factory] Error 1
Failed at 40: sudo -E PATH="$PATH" bash -c "make test"
Build step 'Execute shell' marked build as failure
Performing Post build task...
Match found for :.* : True
Logical operation result is TRUE
Running script  : #!/bin/bash

@egernst
Copy link
Copy Markdown
Member Author

egernst commented Jul 17, 2019

@ganeshmaharaj PTAL @ #1882 (comment)

This was referenced Jul 18, 2019
Closed
Closed
@egernst
Copy link
Copy Markdown
Member Author

egernst commented Jul 18, 2019 •
edited
Loading

/test

Added x-ignore patch from @bergwolf - should pass CI now. let's wait for all to turn green.

@bergwolf
qemu: use x-ignore-shared to implement vm template
0e873b6 
qemu upstream has x-ignore-shared that works similar
to our private bypass-shared-memory. We can use it to
implement the vm template feature.

Fixes: kata-containers#1798
Depends-on: github.com/kata-containers/packaging#641
Signed-off-by: Peng Tao <bergwolf@hyper.sh>
@egernst
Copy link
Copy Markdown
Member Author

egernst commented Jul 18, 2019

@chavafg @GabyCT are either of these familiar?

From fedora:

13:50:19 • Failure [22.480 seconds]
13:50:19 state
13:50:19 /tmp/jenkins/workspace/kata-containers-runtime-fedora-PR/go/src/github.com/kata-containers/tests/functional/state_test.go:26
13:50:19   container
13:50:19   /tmp/jenkins/workspace/kata-containers-runtime-fedora-PR/go/src/github.com/kata-containers/tests/vendor/github.com/onsi/ginkgo/extensions/table/table.go:92
13:50:19     with workload [true], timeWait 5 [It]
13:50:19     /tmp/jenkins/workspace/kata-containers-runtime-fedora-PR/go/src/github.com/kata-containers/tests/vendor/github.com/onsi/ginkgo/extensions/table/table_entry.go:46
13:50:19 
13:50:19     Expected
13:50:19         <int>: 1
13:50:19     to equal
13:50:19         <int>: 0
13:50:19 
13:50:19     /tmp/jenkins/workspace/kata-containers-runtime-fedora-PR/go/src/github.com/kata-containers/tests/functional/state_test.go:45
13:50:19 ------------------------------
13:50:19 SSSSSSS
13:50:19 
13:50:19 Summarizing 1 Failure:
13:50:19 
13:50:19 [Fail] state container [It] with workload [true], timeWait 5 
13:50:19 /tmp/jenkins/workspace/kata-containers-runtime-fedora-PR/go/src/github.com/kata-containers/tests/functional/state_test.go:45
13:50:19 
13:50:19 Ran 1 of 8 Specs in 22.480 seconds
13:50:19 FAIL! -- 0 Passed | 1 Failed | 0 Pending | 7 Skipped --- FAIL: TestFunctional (22.48s)
13:50:19 FAIL

From vsock:

curl: (7) Failed to connect to 10.107.205.234 port 8080: Connection timed out
# service "my-service" deleted
# deployment.extensions "hello-world" deleted
Failed at 60: bats k8s-expose-ip.bats
Makefile:118: recipe for target 'kubernetes' failed

@chavafg chavafg merged commit 9d02bf2 into kata-containers:stable-1.8 Jul 18, 2019
@egernst egernst deleted the backports-for-1.8 branch June 26, 2020 05:32
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

2 more reviewers

@grahamwhaley grahamwhaley grahamwhaley approved these changes

@jodh-intel jodh-intel jodh-intel approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@egernst @jcvenegas @grahamwhaley @jodh-intel @chavafg @odinuge @bergwolf