Skip to content

linux: fix runtime-root propagation#2182

Merged
crosbymichael merged 1 commit intocontainerd:masterfrom
AkihiroSuda:shimtest
Mar 7, 2018
Merged

linux: fix runtime-root propagation#2182
crosbymichael merged 1 commit intocontainerd:masterfrom
AkihiroSuda:shimtest

Conversation

@AkihiroSuda
Copy link
Copy Markdown
Member

@AkihiroSuda AkihiroSuda commented Mar 2, 2018 •
edited
Loading

#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 [email protected]

@AkihiroSuda AkihiroSuda mentioned this pull request Mar 2, 2018
Merged
mlaventure
mlaventure requested changes Mar 2, 2018
View reviewed changes
Comment thread daemon_config_test.go Outdated
)

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

@mlaventure mlaventure Mar 2, 2018

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?

Comment thread daemon_config_test.go Outdated
buf = bytes.NewBuffer(nil)
)

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

@mlaventure mlaventure Mar 2, 2018

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?

@AkihiroSuda
linux: fix runtime-root propagation
125fdef 
faf2781 fixed the propagation for
ShimRemote but ShimLocal was not fixed in the commit.

Signed-off-by: Akihiro Suda <[email protected]>
@AkihiroSuda
Copy link
Copy Markdown
Member Author

AkihiroSuda commented Mar 5, 2018

updated

@AkihiroSuda
Copy link
Copy Markdown
Member Author

AkihiroSuda commented Mar 5, 2018

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
Copy Markdown
Member

Random-Liu commented Mar 5, 2018 •
edited
Loading

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

estesp
estesp approved these changes Mar 7, 2018
View reviewed changes
Copy link
Copy Markdown
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
Copy Markdown
Member

crosbymichael commented Mar 7, 2018

LGTM

@crosbymichael crosbymichael merged commit 856ea51 into containerd:master Mar 7, 2018
@kunalkushwaha kunalkushwaha mentioned this pull request Mar 8, 2018
Merged
@Random-Liu Random-Liu mentioned this pull request Mar 14, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mlaventure mlaventure mlaventure requested changes

@estesp estesp estesp approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@AkihiroSuda @Random-Liu @crosbymichael @estesp @mlaventure