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

runtime: Don' call bindUnmountContainerRootfs for devicemapper device#3011

Merged
amshinde merged 1 commit intokata-containers:stable-1.11from
keloyang:bindmount-stable-1.11
Nov 2, 2020
Merged

runtime: Don' call bindUnmountContainerRootfs for devicemapper device#3011
amshinde merged 1 commit intokata-containers:stable-1.11from
keloyang:bindmount-stable-1.11

Conversation

@keloyang
Copy link
Contributor

backport for #2915
buildContainerRootfs don't call bindMountContainerRootfs if container's rootfs use devicemapper
device in https://github.com/kata-containers/runtime/blob/master/virtcontainers/kata_agent.go#L1300,
so bindUnmountContainerRootfs should not be called if container's rootfs use devicemapper device
in https://github.com/kata-containers/runtime/blob/master/virtcontainers/container.go#L1123

Fixes: #2914

Signed-off-by: Shukui Yang keloyangsk@gmail.com

buildContainerRootfs don't call bindMountContainerRootfs if container's rootfs use devicemapper
device in https://github.com/kata-containers/runtime/blob/master/virtcontainers/kata_agent.go#L1300,
so bindUnmountContainerRootfs should not be called if container's rootfs use devicemapper device
in https://github.com/kata-containers/runtime/blob/master/virtcontainers/container.go#L1123

Fixes: #2914

Signed-off-by: Shukui Yang <keloyangsk@gmail.com>
Copy link

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

Thanks @keloyang.

@amshinde
Copy link
Member

@keloyang See my comments on the original PR. I am not sure if this change is required at all.

@amshinde
Copy link
Member

/test

@codecov
Copy link

codecov bot commented Oct 20, 2020

Codecov Report

Merging #3011 into stable-1.11 will decrease coverage by 1.59%.
The diff coverage is 34.32%.

@@               Coverage Diff               @@
##           stable-1.11    #3011      +/-   ##
===============================================
- Coverage        50.43%   48.83%   -1.60%     
===============================================
  Files              118      118              
  Lines            17114    15329    -1785     
===============================================
- Hits              8631     7486    -1145     
+ Misses            7425     6804     -621     
+ Partials          1058     1039      -19     

@bpradipt
Copy link
Contributor

/test-power

@amshinde amshinde merged commit 15305b8 into kata-containers:stable-1.11 Nov 2, 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.

4 participants