Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

linux: fix runtime-root propagation #2182

Merged
merged 1 commit into from Mar 7, 2018

Conversation

AkihiroSuda
Copy link
Member

@AkihiroSuda AkihiroSuda commented Mar 2, 2018

#2173 fixed the propagation of --runtime-root flag for ShimRemote but ShimLocal was not fixed in the commit.

This PR also adds integration test suite for config.toml.

Signed-off-by: Akihiro Suda suda.akihiro@lab.ntt.co.jp

)

// the following nolint is for shutting up gometalinter on non-linux.
// nolint: unused
Copy link
Contributor

Choose a reason for hiding this comment

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

leave it in daemon_config_linux_test.go instead for now?

buf = bytes.NewBuffer(nil)
)

tempDir, err := ioutil.TempDir("", "containerd-test-new-daemon-with-config")
Copy link
Contributor

Choose a reason for hiding this comment

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

This don't get cleaned up if this functions fails. Add a conditional defer on err != nil?

faf2781 fixed the propagation for
ShimRemote but ShimLocal was not fixed in the commit.

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
@AkihiroSuda
Copy link
Member Author

updated

@AkihiroSuda
Copy link
Member Author

this failure on travis seems unrelated (cc @Random-Liu )

https://travis-ci.org/containerd/containerd/jobs/349152244

 Failure in Spec Setup (BeforeEach) [8.799 seconds]
[k8s.io] Container Mount Propagation
/home/travis/gopath/src/github.com/kubernetes-incubator/cri-tools/pkg/framework/framework.go:72
  runtime should support mount propagation
  /home/travis/gopath/src/github.com/kubernetes-incubator/cri-tools/pkg/validate/container_linux.go:45
    mount with 'rslave' should support propagation from host to container [BeforeEach]
    /home/travis/gopath/src/github.com/kubernetes-incubator/cri-tools/pkg/validate/container_linux.go:128
    failed to create PodSandbox: rpc error: code = Unknown desc = failed to get sandbox image "gcr.io/google_containers/pause:3.0": failed to pull image "gcr.io/google_containers/pause:3.0": failed to pull image "gcr.io/google_containers/pause:3.0": failed to write config: ref k8s.io/11/config-sha256:5fbdc14c118c31ddd5c553f66892b846469341287a0d356485b477467cae6dd0 locked: unavailable
    Expected error:
        <*status.statusError | 0xc420202630>: {
            Code: 2,
            Message: "failed to get sandbox image \"gcr.io/google_containers/pause:3.0\": failed to pull image \"gcr.io/google_containers/pause:3.0\": failed to pull image \"gcr.io/google_containers/pause:3.0\": failed to write config: ref k8s.io/11/config-sha256:5fbdc14c118c31ddd5c553f66892b846469341287a0d356485b477467cae6dd0 locked: unavailable",
            Details: nil,
        }
        rpc error: code = Unknown desc = failed to get sandbox image "gcr.io/google_containers/pause:3.0": failed to pull image "gcr.io/google_containers/pause:3.0": failed to pull image "gcr.io/google_containers/pause:3.0": failed to write config: ref k8s.io/11/config-sha256:5fbdc14c118c31ddd5c553f66892b846469341287a0d356485b477467cae6dd0 locked: unavailable
    not to have occurred
    /home/travis/gopath/src/github.com/kubernetes-incubator/cri-tools/pkg/framework/util.go:147
------------------------------
[BeforeEach] [k8s.io] PodSandbox

@Random-Liu
Copy link
Member

Random-Liu commented Mar 5, 2018

@AkihiroSuda I saw this once. Sometimes image pulling fails when an image is being concurrently pulled. This seems to be a race condition in containerd.

See #2151 (comment)

Copy link
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

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

LGTM

@crosbymichael
Copy link
Member

LGTM

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants