This repository was archived by the owner on May 12, 2021. It is now read-only.
backports: Bp 1.6.4 rel#1675
Merged
jodh-intel merged 5 commits intokata-containers:stable-1.6from May 15, 2019
Merged
Conversation
We should refine unit test which involves func SupportsVsocks and newly reconstructed struct kernelModule. Fixes: kata-containers#1512 Signed-off-by: Penny Zheng <penny.zheng@arm.com> (cherry picked from commit bce0d60) Signed-off-by: Ganesh Maharaj Mahalingam <ganesh.mahalingam@intel.com>
Since we prefer vsock over virtio serial port, we add 'vhost_vsock' in kernel mosules list. But vhost_vsock.ko shouldn't be the definitely required kernel modules, afterall, we could also use virtio serial port. if kata-env shows SupportsVSocks as false, users could run kata-check to manually load vhost_vsock.ko and get detailed info(errors) Fixes: kata-containers#1512 Signed-off-by: Penny Zheng <penny.zheng@arm.com> (cherry picked from commit 9b23d4f) Signed-off-by: Ganesh Maharaj Mahalingam <ganesh.mahalingam@intel.com>
QEMU opens /dev/vhost-vsock and this causes vhost_vsock.ko to be automatically loaded. So, checking the existence of /dev/vhost-vsock is enough. Fixes: kata-containers#1512 Signed-off-by: Penny Zheng <penny.zheng@arm.com> (cherry picked from commit f21d5a3) Signed-off-by: Ganesh Maharaj Mahalingam <ganesh.mahalingam@intel.com>
sockets * cores * threads should be equal to maxcpus otherwise a
warning is thrown: 'warning: Invalid CPU topology deprecated:
sockets * cores * threads != maxcpus'
This warning in the future will be an error and won't be possible to run
kata containers.
fixes kata-containers#1605
Signed-off-by: Julio Montes <julio.montes@intel.com>
(cherry picked from commit fa5de87)
Signed-off-by: Ganesh Maharaj Mahalingam <ganesh.mahalingam@intel.com>
jcvenegas
approved these changes
May 14, 2019
Member
|
/test |
egernst
approved these changes
May 14, 2019
when kata container start fails, netns will leak, add a defer func to fix it Fixes: kata-containers#1640 Signed-off-by: Ace-Tang <aceapril@126.com> (cherry picked from commit a5bc98c) Signed-off-by: Ganesh Maharaj Mahalingam <ganesh.mahalingam@intel.com>
ganeshmaharaj
force-pushed
the
bp-1.6.4-rel
branch
from
a28dd29 to
b0d86cc
Compare
Contributor
Author
|
/retest |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This stable backport includes the below changes.
#1513
#1606
#1641
The below changes marked as
stable-candidatewere not included cause of missing base changes.#1623
#1628
#1630
#1651