Ensure the mount point is propagated #230

miaoyq · 2017-09-08T15:06:59Z

mount with rshared, the host path should be shared.
mount with rslave, the host pash should be shared or slave.

Based on #246

Signed-off-by: Yanqiang Miao miao.yanqiang@zte.com.cn

miaoyq · 2017-09-11T01:14:08Z

The CI failed because we have not used the real path.
Maybe we should add this in kubelet side.
@Random-Liu What do you think for this?

Random-Liu · 2017-09-13T00:59:15Z

@miaoyq Will review this PR after Thursday. BTW, would you mind me mention ZTE is contributing to cri-containerd in the moby summit LA? I want to thank you guys for your contribution. :)

miaoyq · 2017-09-13T06:53:52Z

Of course not, i really appreciate that. : )

miaoyq · 2017-09-14T01:12:34Z

I've manually made unit test locally, and it works, but the travis-ci always failed.
@Random-Liu Does the travis-ci run as non root user?

Related to containerd#230 Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>

miaoyq · 2017-09-15T05:52:55Z

@Random-Liu The travis-ci run unit test as non root user, but mount operation need root user.

I have create a pr for this, see #246, PTAL, Thanks :)

Random-Liu · 2017-09-16T00:27:37Z

pkg/server/container_create_test.go

@@ -48,8 +50,57 @@ func checkMount(t *testing.T, mounts []runtimespec.Mount, src, dest, typ string,
 	assert.True(t, found, "mount from %q to %q not found", src, dest)
 }

-func getCreateContainerTestData() (*runtime.ContainerConfig, *runtime.PodSandboxConfig,
-	*imagespec.ImageConfig, func(*testing.T, string, uint32, *runtimespec.Spec)) {
+func createHostPath(t *testing.T, mounts []*runtime.Mount) {


Don't think we should test this in unit test.
We have replaced or os with FakeOS. This test won't work.
If we really want to test, we should leverage the FakeOS to test.

I'll add our own integration test framework, we could add this kind of test there.

Random-Liu · 2017-09-16T06:11:12Z

pkg/server/container_create.go

+	optsSplit := strings.Split(optionalOpts, " ")
+	for _, opt := range optsSplit {
+		if strings.HasPrefix(opt, "shared:") {
+			sharedMount = true


return nil directly.

Random-Liu · 2017-09-16T06:11:29Z

pkg/server/container_create.go

+			sharedMount = true
+			break
+		} else if strings.HasPrefix(opt, "master:") {
+			slaveMount = true


return nil directly.

Random-Liu · 2017-09-16T06:12:02Z

pkg/server/container_create.go

+			slaveMount = true
+			break
+		}
+	}


return error here.

Random-Liu · 2017-09-16T06:17:41Z

pkg/server/container_create.go

+
+func getSourceMount(source string) (string, string, error) {
+	// Ensure any symlinks are resolved.
+	sourcePath, err := filepath.EvalSymlinks(source)


No need to resolve symlink. We've done that in addOCIBindMounts.

Random-Liu · 2017-09-16T06:18:46Z

pkg/server/container_create.go

+		return "", "", err
+	}
+
+	mountinfos, err := mount.GetMounts()


Add GetMounts to os package, so that you could use fake os in unit test, and please add unit test based on that.

That's better. 👍

Random-Liu · 2017-09-16T06:19:55Z

pkg/server/container_create.go

+	optsSplit := strings.Split(optionalOpts, " ")
+	for _, opt := range optsSplit {
+		if strings.HasPrefix(opt, "shared:") {
+			sharedMount = true


return nil here.

Random-Liu · 2017-09-16T06:20:13Z

pkg/server/container_create.go

+			break
+		}
+	}
+


return error.

Random-Liu · 2017-09-16T06:24:08Z

pkg/server/container_create.go

+	return nil
+}
+
+func getSourceMount(source string) (string, string, error) {


Probably move this to helper.

miaoyq · 2017-09-16T16:00:22Z

@Random-Liu Thank you for review, I'm addressing the comments.

miaoyq · 2017-09-17T09:20:39Z

@Random-Liu Have addressed, PTAL, Thanks!

Random-Liu · 2017-09-18T18:10:49Z

pkg/server/helpers.go

@@ -384,3 +385,35 @@ func isInCRIMounts(dst string, mounts []*runtime.Mount) bool {
 	}
 	return false
 }
+


Add TODO to replace with mount.Lookup() in containerd.

And please replace with mount.Loopup() after #257 is merged.

Random-Liu · 2017-09-19T03:48:49Z

pkg/server/container_create.go

+		}
+	}
+
+	return fmt.Errorf("path %s is mounted on %s but it is not a shared mount", path, sourceMount)


Use %q for string.

Random-Liu · 2017-09-19T03:52:52Z

pkg/server/container_create.go

+			return nil
+		}
+	}
+	return fmt.Errorf("path %s is mounted on %s but it is not a shared or slave mount", path, sourceMount)


Random-Liu · 2017-09-19T03:53:33Z

pkg/server/container_create_test.go

 	imagespec "github.com/opencontainers/image-spec/specs-go/v1"
 	runtimespec "github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/opencontainers/runtime-tools/generate"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"

+	testing2 "github.com/kubernetes-incubator/cri-containerd/pkg/os/testing"


ostesting "github.com/kubernetes-incubator/cri-containerd/pkg/os/testing"

Random-Liu · 2017-09-19T03:55:50Z

pkg/server/container_create_test.go

+			},
+			fakeGetMountsFn: nil,
+			optionsCheck:    []string{"rbind", "rprivate"},
+		},


Should add error test case, which host path propagation is not properly set, we should expect an error from addOCIBindMounts.

miaoyq · 2017-09-19T05:49:38Z

@Random-Liu Thanks for review, Have addressed.

Random-Liu

LGTM with one nit. Good to go after address the nit.

Random-Liu · 2017-09-19T06:03:07Z

pkg/server/container_create_test.go

+	}
+
+	for desc, test := range map[string]struct {
+		criMount        *runtime.Mount


Add expectErr bool.

We could:

assert error, if expectErr==true.

assert no error and check options, if expectErr==false.

OK, I will change according to your instructions, thanks!

mount with `rshared`, the host path should be shared. mount with `rslave`, the host pash should be shared or slave. Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>

Random-Liu · 2017-09-19T06:42:08Z

LGTM

Random-Liu · 2017-09-19T06:44:36Z

The test failure feels like a flake, filed #259 for it.

Will retrigger the test.

k8s-ci-robot requested a review from Random-Liu September 8, 2017 15:07

k8s-ci-robot added cncf-cla: yes size/L labels Sep 8, 2017

miaoyq force-pushed the ensure-mount-shared-slave branch from d8ca3ff to 19ed6fe Compare September 8, 2017 15:09

miaoyq mentioned this pull request Sep 12, 2017

Create host path is mount source does not exist. #237

Merged

miaoyq force-pushed the ensure-mount-shared-slave branch 3 times, most recently from 0c13442 to d391d7b Compare September 12, 2017 08:51

miaoyq pushed a commit to miaoyq/cri-containerd that referenced this pull request Sep 15, 2017

Run unit test with sudo

b5f0d66

Related to containerd#230 Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>

miaoyq mentioned this pull request Sep 15, 2017

Run unit test with sudo #246

Closed

miaoyq force-pushed the ensure-mount-shared-slave branch from d391d7b to fca9631 Compare September 15, 2017 05:23

Random-Liu added this to the v1.0.0-alpha.0 milestone Sep 15, 2017

Random-Liu reviewed Sep 16, 2017

View reviewed changes

Random-Liu self-assigned this Sep 16, 2017

Random-Liu reviewed Sep 16, 2017

View reviewed changes

miaoyq force-pushed the ensure-mount-shared-slave branch from fca9631 to b59c02e Compare September 17, 2017 09:14

Random-Liu reviewed Sep 19, 2017

View reviewed changes

miaoyq force-pushed the ensure-mount-shared-slave branch from b59c02e to 24930a2 Compare September 19, 2017 05:37

miaoyq force-pushed the ensure-mount-shared-slave branch from 24930a2 to f750aa5 Compare September 19, 2017 05:56

Random-Liu reviewed Sep 19, 2017

View reviewed changes

miaoyq force-pushed the ensure-mount-shared-slave branch from f750aa5 to 49eb38a Compare September 19, 2017 06:17

Ensure the mount point is propagated

49eb38a

mount with `rshared`, the host path should be shared. mount with `rslave`, the host pash should be shared or slave. Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>

Random-Liu added the lgtm label Sep 19, 2017

Random-Liu merged commit 4371312 into containerd:master Sep 19, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Ensure the mount point is propagated #230

Ensure the mount point is propagated #230

miaoyq commented Sep 8, 2017 •

edited

Loading

miaoyq commented Sep 11, 2017

Random-Liu commented Sep 13, 2017 •

edited

Loading

miaoyq commented Sep 13, 2017

miaoyq commented Sep 14, 2017

miaoyq commented Sep 15, 2017

Random-Liu Sep 16, 2017

Random-Liu Sep 16, 2017

Random-Liu Sep 16, 2017

Random-Liu Sep 16, 2017

Random-Liu Sep 16, 2017

Random-Liu Sep 16, 2017

Random-Liu Sep 16, 2017

miaoyq Sep 16, 2017

Random-Liu Sep 16, 2017

Random-Liu Sep 16, 2017

Random-Liu Sep 16, 2017

miaoyq commented Sep 16, 2017 •

edited

Loading

miaoyq commented Sep 17, 2017

Random-Liu Sep 18, 2017

Random-Liu Sep 19, 2017

Random-Liu Sep 19, 2017

Random-Liu Sep 19, 2017

Random-Liu Sep 19, 2017

Random-Liu Sep 19, 2017

miaoyq commented Sep 19, 2017

Random-Liu left a comment

Random-Liu Sep 19, 2017

miaoyq Sep 19, 2017

miaoyq Sep 19, 2017

Random-Liu commented Sep 19, 2017

Random-Liu commented Sep 19, 2017

Ensure the mount point is propagated #230

Ensure the mount point is propagated #230

Conversation

miaoyq commented Sep 8, 2017 • edited Loading

miaoyq commented Sep 11, 2017

Random-Liu commented Sep 13, 2017 • edited Loading

miaoyq commented Sep 13, 2017

miaoyq commented Sep 14, 2017

miaoyq commented Sep 15, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

miaoyq commented Sep 16, 2017 • edited Loading

miaoyq commented Sep 17, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

miaoyq commented Sep 19, 2017

Random-Liu left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Random-Liu commented Sep 19, 2017

Random-Liu commented Sep 19, 2017

miaoyq commented Sep 8, 2017 •

edited

Loading

Random-Liu commented Sep 13, 2017 •

edited

Loading

miaoyq commented Sep 16, 2017 •

edited

Loading