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

Backports for 1.7.1#1756

Merged
egernst merged 21 commits intokata-containers:stable-1.7from
ganeshmaharaj:bp-1.7.1
Jun 5, 2019
Merged

Backports for 1.7.1#1756
egernst merged 21 commits intokata-containers:stable-1.7from
ganeshmaharaj:bp-1.7.1

Conversation

@ganeshmaharaj
Copy link
Contributor

@ganeshmaharaj ganeshmaharaj commented Jun 3, 2019 •
edited
Loading

Backport patches for 1.7.1 release.

#1665
#1670
#1676
#1679
#1691
#1694
#1697
#1703
#1708
#1710
#1717
#1721
#1722
#1723
#1724
#1727
#1739
#1741
#1762

Not Included
#1732 <-- Has vendor changes that is not playing well with the branch.

chavafg and others added 2 commits June 3, 2019 13:27
@chavafg
ci: Build kata-runtime before running static checks
0a46998 
We need to build kata-runtime to have the correct files
in place to be able to run the static checks script.

Fixes kata-containers#1716.

Signed-off-by: Salvador Fuentes <salvador.fuentes@intel.com>
(cherry picked from commit e8bf810)
Signed-off-by: Ganesh Maharaj Mahalingam <ganesh.mahalingam@intel.com>
@jshachm
runtime : delete redundant code in CreateContainer
3cb6316 
Here we have done with logger and container ID map
Just delete these code.
fixes kata-containers#1740

Signed-off-by: Haomin Tsai <caihaomin@huawei.com>
(cherry picked from commit bdae295)
Signed-off-by: Ganesh Maharaj Mahalingam <ganesh.mahalingam@intel.com>
@egernst
Copy link
Member

egernst commented Jun 4, 2019

/test

@ganeshmaharaj
Copy link
Contributor Author

ganeshmaharaj commented Jun 4, 2019

/test

@codecov
Copy link

codecov bot commented Jun 4, 2019

Codecov Report

❗ No coverage uploaded for pull request base (stable-1.7@d4f4644). Click here to learn what that means.
The diff coverage is 23.68%.

@@              Coverage Diff              @@
##             stable-1.7    #1756   +/-   ##
=============================================
  Coverage              ?   53.88%           
=============================================
  Files                 ?      106           
  Lines                 ?    13096           
  Branches              ?        0           
=============================================
  Hits                  ?     7057           
  Misses                ?     5195           
  Partials              ?      844

1 similar comment
@codecov
Copy link

codecov bot commented Jun 4, 2019

Codecov Report

❗ No coverage uploaded for pull request base (stable-1.7@d4f4644). Click here to learn what that means.
The diff coverage is 23.68%.

@@              Coverage Diff              @@
##             stable-1.7    #1756   +/-   ##
=============================================
  Coverage              ?   53.88%           
=============================================
  Files                 ?      106           
  Lines                 ?    13096           
  Branches              ?        0           
=============================================
  Hits                  ?     7057           
  Misses                ?     5195           
  Partials              ?      844

@ganeshmaharaj
Copy link
Contributor Author

ganeshmaharaj commented Jun 4, 2019

/test

teawater and others added 18 commits June 4, 2019 15:31
@teawater
kata_proxy: Set Setsid to true when exec kata-proxy
6434414 
There is an issue that ctrl-c stop vmcache server will stop all
containers that its VM is created by it.
The cause is kata-proxy and vmcache server use same tty, for example:
ps -e | grep kata
3617 pts/5    00:00:00 kata-runtime
3636 pts/5    00:00:00 kata-proxy
Ctrl-c will send signal to both kata-proxy and vmcache server.
Then the containers that its VM is created by this vmcache server will
quit with it.

Set Setsid to true when exec kata-proxy to handle this issue.

Fixes: kata-containers#1726

Signed-off-by: Hui Zhu <teawater@hyper.sh>
(cherry picked from commit 19115ef)
Signed-off-by: Ganesh Maharaj Mahalingam <ganesh.mahalingam@intel.com>
@teawater
cache: Call vm.Disconnect() when close vm
5eecdae 
After previous commit, found that kata-proxy is not quit
when vmcache server is stopped by ctrl-c.
The cause is current kata-proxy is setsid when it exec.  It will
not get the signal ctrl-c.

Call vm.Disconnect() when close vm in cache factory to handle
this issue.

Fixes: kata-containers#1726

Signed-off-by: Hui Zhu <teawater@hyper.sh>
(cherry picked from commit 7bf6c67)
Signed-off-by: Ganesh Maharaj Mahalingam <ganesh.mahalingam@intel.com>
data: Revert pull request kata-containers#1405
ad4b07d 
The rootfs image was fixed, now the DAX metadata and 2 MBRs headers are part
of the same image. Mounting the rootfs partiton with an offset of 2M is no
more needed, since the first MBR is read by partx or losetup by default.

fixes kata-containers#1443

Signed-off-by: Julio Montes julio.montes@intel.com
(cherry picked from commit 82e51d4)
Signed-off-by: Ganesh Maharaj Mahalingam <ganesh.mahalingam@intel.com>
@lifupan
shimv2: fix the issue of passing the wrong container id
a98871e 
It should pass the container id instead of sandbox id.

Fixes:kata-containers#1672

Signed-off-by: lifupan <lifupan@gmail.com>
(cherry picked from commit 5e1f5ca)
Signed-off-by: Ganesh Maharaj Mahalingam <ganesh.mahalingam@intel.com>
@lifupan
shimv2: kill a container return directly once the container termianted
eb75d0c 
According to CRI specs, kubelet will call StopPodSandbox()
at least once before calling RemovePodSandbox, and this call
is idempotent, and must not return an error if all relevant
resources have already been reclaimed. And in that call it will
send a SIGKILL signal first to try to stop the container, thus
once the container has terminated, here should ignore this signal
and return directly.

Fixes:kata-containers#1672

Signed-off-by: lifupan <lifupan@gmail.com>
(cherry picked from commit 0d535f5)
Signed-off-by: Ganesh Maharaj Mahalingam <ganesh.mahalingam@intel.com>
@lifupan
shimv2: shutdown the sandbox when sandbox container exited
9661586 
Kubelet would cleanup the pod cgroup resources and kill the processes
in the pod cgroups when it detected all of the containers in a pod exited,
thus shimv2 should close the hypervisor process once the podsandbox container
exited, otherwise, the hypervisor process would be killed by kubelet and
made shimv2 failed to shutdown the sandbox.

Fixes:kata-containers#1672

Signed-off-by: lifupan <lifupan@gmail.com>
(cherry picked from commit f301c95)
Signed-off-by: Ganesh Maharaj Mahalingam <ganesh.mahalingam@intel.com>
@Ace-Tang
shimv2: remove use containerd ns as netns
a0c413a 
```
//the network namespace created by cni plugin
netns, err = namespaces.NamespaceRequired(ctx)
if err != nil {
        return nil, errors.Wrap(err, "create namespace")
}
```

the netns is a containerd namespace concept, it not netns, event a cni
set netns for this, this is a tricky way, so remove the logic.

Fixes: kata-containers#1692

Signed-off-by: Ace-Tang <aceapril@126.com>
(cherry picked from commit d6b3bff)
Signed-off-by: Ganesh Maharaj Mahalingam <ganesh.mahalingam@intel.com>
data/kata-collect-data: support kata containers snap
2c444f3 
Use `kata-containers.runtime` that is the runtime binary, to
collect the data if the kata-runtime binary is not installed

fixes kata-containers#1720

Signed-off-by: Julio Montes <julio.montes@intel.com>
(cherry picked from commit 19288aa)
Signed-off-by: Ganesh Maharaj Mahalingam <ganesh.mahalingam@intel.com>
nemu-config: fix nemu for ci
97cf3c9 
virtio-fs is now available in 1.7 release and needs hugepages enabled.
Updating version of NEMU that ships with kata by default which contains
the fixes for hugepages, machine_type=virt and network access.

Fixes: kata-containers#1709
Signed-off-by: Ganesh Maharaj Mahalingam <ganesh.mahalingam@intel.com>
(cherry picked from commit 722ac5a)
Signed-off-by: Ganesh Maharaj Mahalingam <ganesh.mahalingam@intel.com>
@chavafg
nemu-config: Add machine_type to config file
a268c66 
nemu needs to be configured with:
`machine_type = "virt"` by default.

In addition, this commit removes
`machine_accelerators="virt"` which was added instead
of `machine_type` in a previous commit.

Fixes: kata-containers#1707.

Signed-off-by: Salvador Fuentes <salvador.fuentes@intel.com>
(cherry picked from commit 6be5e5f)
Signed-off-by: Ganesh Maharaj Mahalingam <ganesh.mahalingam@intel.com>
@nitkon
virtcontainers: Set correct Shmsize for ppc64le
feddee0 
Fix the test case TestGetShmSizeBindMounted by
setting the right ShmSize for ppc64le.

Fixes: kata-containers#1702

Signed-off-by: Nitesh Konkar niteshkonkar@in.ibm.com
(cherry picked from commit 1789b65)
Signed-off-by: Ganesh Maharaj Mahalingam <ganesh.mahalingam@intel.com>
@GabyCT
versions: Update CRI-O version to 1.14.1
58f7eea 
Now that CRI-O released a new version we can update it.

Fixes kata-containers#1696

Signed-off-by: Gabriela Cervantes <gabriela.cervantes.tellez@intel.com>
(cherry picked from commit 5d527d7)
Signed-off-by: Ganesh Maharaj Mahalingam <ganesh.mahalingam@intel.com>
@marcov
versions: Update golang to 1.11.10
0199d89 
Set the minimum golang version to 1.11.10, the latest stable 1.11 version
at the time of writing. Go 1.11 is required to build the agent with working
vsock support.

Fixes: kata-containers#1693

Signed-off-by: Marco Vedovati <mvedovati@suse.com>
(cherry picked from commit c22b15d)
Signed-off-by: Ganesh Maharaj Mahalingam <ganesh.mahalingam@intel.com>
@bergwolf
qemu: print virtiofsd logs when debug is on
52f0193 
To help trace virtiofsd issues.

Signed-off-by: Peng Tao <bergwolf@hyper.sh>
(cherry picked from commit d0aae80)
Signed-off-by: Ganesh Maharaj Mahalingam <ganesh.mahalingam@intel.com>
@bergwolf
qemu: stop qemu process when virtiofsd quits
fb2a995 
If virtiofsd fails to initialize and stops unexpected,
qemu might hang forever. We just stop the qemu process.
Resource cleanup will be done by others.

Fixes: kata-containers#1690
Signed-off-by: Peng Tao <bergwolf@hyper.sh>
(cherry picked from commit 89e0dfa)
Signed-off-by: Ganesh Maharaj Mahalingam <ganesh.mahalingam@intel.com>
@teawater
kata_proxy: Open a special goroutine do cmd.Wait
7c7da54 
Got a defunct kata-proxy after kata quit when VMCache is enabled.
The reason is vmcache server opens kata-proxy but doesn't wait it.

If VMCache is disabled, kata-runtime will quit before kata-proxy.
So it will not meet the issue.

Open a special goroutine do cmd.Wait in kataProxy.start to handle
the isssue.

Fixes: kata-containers#1678

Signed-off-by: Hui Zhu <teawater@hyper.sh>
(cherry picked from commit 00d03c1)
Signed-off-by: Ganesh Maharaj Mahalingam <ganesh.mahalingam@intel.com>
@zhabinecho
network: delete IP addrs on bridge model to prevent ARP conflict
8c199e2 
Fixes: kata-containers#1673

Signed-off-by: Zha Bin <zhabin@linux.alibaba.com>
(cherry picked from commit bdb1047)
Signed-off-by: Ganesh Maharaj Mahalingam <ganesh.mahalingam@intel.com>
@xs3c
shimv2: Close vhostfd after vm get vhostfd
b798c28 
If kata containers is using vfio and vhost net，the unbinding
of vfio would be hang. In the scenario, vhost net kernel thread
takes a reference to the qemu's mm, and the reference also includes
the mmap regions on the vfio device file. so vhost kernel thread
would be not released when qemu is killed as the vhost file
descriptor still is opened by shim v2 process, and the vfio device
is not released because there's still a reference to the mmap.

Fixes: kata-containers#1669

Signed-off-by: Yang, Wei <w90p710@gmail.com>
Signed-off-by: Eric Ernst <eric.ernst@intel.com>
(cherry picked from commit 071030b)
Signed-off-by: Ganesh Maharaj Mahalingam <ganesh.mahalingam@intel.com>
@ganeshmaharaj
Copy link
Contributor Author

ganeshmaharaj commented Jun 4, 2019

/test

fc-toml: remove proxy section in config
a480f27 
proxy will never be use with the Firecracker VMM. Keeping this header
will result in runtime failures, since the configuration will be parsed
on the path searched for.

Since vsock will always be used, remove the proxy section.

Fixes: kata-containers#1761

Signed-off-by: Eric Ernst <eric.ernst@intel.com>
(cherry picked from commit bbe5584)
Signed-off-by: Ganesh Maharaj Mahalingam <ganesh.mahalingam@intel.com>
@ganeshmaharaj
Copy link
Contributor Author

ganeshmaharaj commented Jun 4, 2019

/test

@ganeshmaharaj
Copy link
Contributor Author

ganeshmaharaj commented Jun 5, 2019

RHEL-7 builds seem to be failing with missing package dependencies.

--> Package perl-HTTP-Message.noarch 0:6.06-6.el7 will be installed
--> Processing Dependency: perl(HTTP::Date) >= 6 for package: perl-HTTP-Message-6.06-6.el7.noarch
--> Processing Dependency: perl(Encode::Locale) >= 1 for package: perl-HTTP-Message-6.06-6.el7.noarch
--> Processing Dependency: perl(IO::HTML) for package: perl-HTTP-Message-6.06-6.el7.noarch
---> Package perl-HTTP-Negotiate.noarch 0:6.01-5.el7 will be installed
---> Package perl-IO-Socket-SSL.noarch 0:1.94-7.el7 will be installed
--> Processing Dependency: perl-Net-SSLeay >= 1.55-5 for package: perl-IO-Socket-SSL-1.94-7.el7.noarch
--> Processing Dependency: perl(Net::SSLeay) >= 1.21 for package: perl-IO-Socket-SSL-1.94-7.el7.noarch
--> Processing Dependency: perl(IO::Socket::IP) >= 0.20 for package: perlError: Package: 7:device-mapper-devel-1.02.149-10.el7_6.8.x86_64 (rhui-rhel-7-server-rhui-optional-rpms)
           Requires: device-mapper = 7:1.02.149-10.el7_6.8

@egernst
Copy link
Member

egernst commented Jun 5, 2019

rekicked RHEL test.

@jodh-intel
Copy link

jodh-intel commented Jun 5, 2019

Restarted the failing Travis job (network issue) and it has now passed.

@egernst egernst merged commit fe7e3cb into kata-containers:stable-1.7 Jun 5, 2019
@ganeshmaharaj ganeshmaharaj mentioned this pull request Jun 8, 2019
Closed
@ganeshmaharaj ganeshmaharaj deleted the bp-1.7.1 branch July 17, 2019 17:00
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

2 more reviewers

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

@GabyCT GabyCT GabyCT 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.