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

Merge pull request #271 from Random-Liu/register-name-after-recover

Browse Source 
Should register container/sandbox name after restart.
This commit is contained in:
Lantao Liu 2017-09-21 15:10:39 -07:00 committed by GitHub
commit 2ac9262091
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/server/restart.go
View File

@ -65,6 +65,9 @@ func (c *criContainerdService) recover(ctx context.Context) error {
if err := c.sandboxStore.Add(sb); err != nil { if err := c.sandboxStore.Add(sb); err != nil {
return fmt.Errorf("failed to add sandbox %q to store: %v", sandbox.ID(), err) return fmt.Errorf("failed to add sandbox %q to store: %v", sandbox.ID(), err)
} }
if err := c.sandboxNameIndex.Reserve(sb.Name, sb.ID); err != nil {
return fmt.Errorf("failed to reserve sandbox name %q: %v", sb.Name, err)
}
} }
// Recover all containers. // Recover all containers.
@ -83,6 +86,9 @@ func (c *criContainerdService) recover(ctx context.Context) error {
if err := c.containerStore.Add(cntr); err != nil { if err := c.containerStore.Add(cntr); err != nil {
return fmt.Errorf("failed to add container %q to store: %v", container.ID(), err) return fmt.Errorf("failed to add container %q to store: %v", container.ID(), err)
} }
if err := c.containerNameIndex.Reserve(cntr.Name, cntr.ID); err != nil {
return fmt.Errorf("failed to reserve container name %q: %v", cntr.Name, err)
}
} }
// Recover all images. // Recover all images.