github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #1013 from JoeWrightss/patch-3

Browse Source 
Fix return error message
This commit is contained in:
Mike Brown 2018-12-30 15:57:22 -06:00 committed by GitHub
commit 888f7a03a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/server/restart.go
View File

@ -146,7 +146,7 @@ func (c *criService) recover(ctx context.Context) error {
// * ListContainerStats: Not in critical code path, a default timeout will // * ListContainerStats: Not in critical code path, a default timeout will
// be applied at CRI level. // be applied at CRI level.
// * Recovery logic: We should set a time for each container/sandbox recovery. // * Recovery logic: We should set a time for each container/sandbox recovery.
// * Event montior: We should set a timeout for each container/sandbox event handling. // * Event monitor: We should set a timeout for each container/sandbox event handling.
const loadContainerTimeout = 10 * time.Second const loadContainerTimeout = 10 * time.Second
// loadContainer loads container from containerd and status checkpoint. // loadContainer loads container from containerd and status checkpoint.

2
pkg/server/sandbox_stop.go
View File

@ -128,7 +128,7 @@ func (c *criService) waitSandboxStop(ctx context.Context, sandbox sandboxstore.S
// teardownPod removes the network from the pod // teardownPod removes the network from the pod
func (c *criService) teardownPod(id string, path string, config *runtime.PodSandboxConfig) error { func (c *criService) teardownPod(id string, path string, config *runtime.PodSandboxConfig) error {
if c.netPlugin == nil { if c.netPlugin == nil {
return errors.New("cni config not intialized") return errors.New("cni config not initialized")
} }
labels := getPodCNILabels(id, config) labels := getPodCNILabels(id, config)