Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[release-1.21] server: rework internal wipe to play better with reboots #4928

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.

Sign up for GitHub

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

Merged
openshift-merge-robot merged 4 commits into from
May 20, 2021
Merged

[release-1.21] server: rework internal wipe to play better with reboots #4928

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5a6a27b
server: properly remove sandbox network on failed restore
haircommander May 13, 2021
847885c
move internal wipe to only wipe images
haircommander May 13, 2021
000501b
ignore storage.ErrNotAContainer
haircommander May 13, 2021
dd4bda8
test: adapt crio wipe tests to handle new behavior
haircommander May 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 26 additions & 26 deletions internal/lib/container_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,23 +136,23 @@ func New(ctx context.Context, configIface libconfig.Iface) (*ContainerServer, er
}

// LoadSandbox loads a sandbox from the disk into the sandbox store
func (c *ContainerServer) LoadSandbox(ctx context.Context, id string) (retErr error) {
func (c *ContainerServer) LoadSandbox(ctx context.Context, id string) (sb *sandbox.Sandbox, retErr error) {
config, err := c.store.FromContainerDirectory(id, "config.json")
if err != nil {
return err
return nil, err
}
var m rspec.Spec
if err := json.Unmarshal(config, &m); err != nil {
return errors.Wrap(err, "error unmarshalling sandbox spec")
return nil, errors.Wrap(err, "error unmarshalling sandbox spec")
}
labels := make(map[string]string)
if err := json.Unmarshal([]byte(m.Annotations[annotations.Labels]), &labels); err != nil {
return errors.Wrapf(err, "error unmarshalling %s annotation", annotations.Labels)
return nil, errors.Wrapf(err, "error unmarshalling %s annotation", annotations.Labels)
}
name := m.Annotations[annotations.Name]
name, err = c.ReservePodName(id, name)
if err != nil {
return err
return nil, err
}
defer func() {
if retErr != nil {
Expand All @@ -161,7 +161,7 @@ func (c *ContainerServer) LoadSandbox(ctx context.Context, id string) (retErr er
}()
var metadata sandbox.Metadata
if err := json.Unmarshal([]byte(m.Annotations[annotations.Metadata]), &metadata); err != nil {
return errors.Wrapf(err, "error unmarshalling %s annotation", annotations.Metadata)
return nil, errors.Wrapf(err, "error unmarshalling %s annotation", annotations.Metadata)
}

processLabel := m.Process.SelinuxLabel
Expand All @@ -171,29 +171,29 @@ func (c *ContainerServer) LoadSandbox(ctx context.Context, id string) (retErr er

kubeAnnotations := make(map[string]string)
if err := json.Unmarshal([]byte(m.Annotations[annotations.Annotations]), &kubeAnnotations); err != nil {
return errors.Wrapf(err, "error unmarshalling %s annotation", annotations.Annotations)
return nil, errors.Wrapf(err, "error unmarshalling %s annotation", annotations.Annotations)
}

portMappings := []*hostport.PortMapping{}
if err := json.Unmarshal([]byte(m.Annotations[annotations.PortMappings]), &portMappings); err != nil {
return errors.Wrapf(err, "error unmarshalling %s annotation", annotations.PortMappings)
return nil, errors.Wrapf(err, "error unmarshalling %s annotation", annotations.PortMappings)
}

privileged := isTrue(m.Annotations[annotations.PrivilegedRuntime])
hostNetwork := isTrue(m.Annotations[annotations.HostNetwork])
nsOpts := types.NamespaceOption{}
if err := json.Unmarshal([]byte(m.Annotations[annotations.NamespaceOptions]), &nsOpts); err != nil {
return errors.Wrapf(err, "error unmarshalling %s annotation", annotations.NamespaceOptions)
return nil, errors.Wrapf(err, "error unmarshalling %s annotation", annotations.NamespaceOptions)
}

created, err := time.Parse(time.RFC3339Nano, m.Annotations[annotations.Created])
if err != nil {
return errors.Wrap(err, "parsing created timestamp annotation")
return nil, errors.Wrap(err, "parsing created timestamp annotation")
}

sb, err := sandbox.New(id, m.Annotations[annotations.Namespace], name, m.Annotations[annotations.KubeName], filepath.Dir(m.Annotations[annotations.LogPath]), labels, kubeAnnotations, processLabel, mountLabel, &metadata, m.Annotations[annotations.ShmPath], m.Annotations[annotations.CgroupParent], privileged, m.Annotations[annotations.RuntimeHandler], m.Annotations[annotations.ResolvPath], m.Annotations[annotations.HostName], portMappings, hostNetwork, created, m.Annotations[crioann.UsernsModeAnnotation])
sb, err = sandbox.New(id, m.Annotations[annotations.Namespace], name, m.Annotations[annotations.KubeName], filepath.Dir(m.Annotations[annotations.LogPath]), labels, kubeAnnotations, processLabel, mountLabel, &metadata, m.Annotations[annotations.ShmPath], m.Annotations[annotations.CgroupParent], privileged, m.Annotations[annotations.RuntimeHandler], m.Annotations[annotations.ResolvPath], m.Annotations[annotations.HostName], portMappings, hostNetwork, created, m.Annotations[crioann.UsernsModeAnnotation])
if err != nil {
return err
return nil, err
}
sb.AddHostnamePath(m.Annotations[annotations.HostnamePath])
sb.SetSeccompProfilePath(spp)
Expand Down Expand Up @@ -221,13 +221,13 @@ func (c *ContainerServer) LoadSandbox(ctx context.Context, id string) (retErr er
path, err := configNsPath(&m, namespaceToJoin.rspecNS)
if err == nil {
if nsErr := namespaceToJoin.joinFunc(path); nsErr != nil {
return nsErr
return sb, nsErr
}
}
}

if err := c.AddSandbox(sb); err != nil {
return err
return sb, err
}

defer func() {
Expand All @@ -240,19 +240,19 @@ func (c *ContainerServer) LoadSandbox(ctx context.Context, id string) (retErr er

sandboxPath, err := c.store.ContainerRunDirectory(id)
if err != nil {
return err
return sb, err
}

sandboxDir, err := c.store.ContainerDirectory(id)
if err != nil {
return err
return sb, err
}

cID := m.Annotations[annotations.ContainerID]

cname, err := c.ReserveContainerName(cID, m.Annotations[annotations.ContainerName])
if err != nil {
return err
return sb, err
}
defer func() {
if retErr != nil {
Expand All @@ -272,15 +272,15 @@ func (c *ContainerServer) LoadSandbox(ctx context.Context, id string) (retErr er
if !wasSpoofed {
scontainer, err = oci.NewContainer(m.Annotations[annotations.ContainerID], cname, sandboxPath, m.Annotations[annotations.LogPath], labels, m.Annotations, kubeAnnotations, m.Annotations[annotations.Image], "", "", nil, id, false, false, false, sb.RuntimeHandler(), sandboxDir, created, m.Annotations["org.opencontainers.image.stopSignal"])
if err != nil {
return err
return sb, err
}
scontainer.SetSpec(&m)
scontainer.SetMountPoint(m.Annotations[annotations.MountPoint])

if m.Annotations[annotations.Volumes] != "" {
containerVolumes := []oci.ContainerVolume{}
if err = json.Unmarshal([]byte(m.Annotations[annotations.Volumes]), &containerVolumes); err != nil {
return fmt.Errorf("failed to unmarshal container volumes: %v", err)
return sb, fmt.Errorf("failed to unmarshal container volumes: %v", err)
}
for _, cv := range containerVolumes {
scontainer.AddVolume(cv)
Expand All @@ -291,28 +291,28 @@ func (c *ContainerServer) LoadSandbox(ctx context.Context, id string) (retErr er
}

if err := c.ContainerStateFromDisk(ctx, scontainer); err != nil {
return fmt.Errorf("error reading sandbox state from disk %q: %v", scontainer.ID(), err)
return sb, fmt.Errorf("error reading sandbox state from disk %q: %v", scontainer.ID(), err)
}

// We write back the state because it is possible that crio did not have a chance to
// read the exit file and persist exit code into the state on reboot.
if err := c.ContainerStateToDisk(ctx, scontainer); err != nil {
return fmt.Errorf("failed to write container %q state to disk: %v", scontainer.ID(), err)
return sb, fmt.Errorf("failed to write container %q state to disk: %v", scontainer.ID(), err)
}

if err := sb.SetInfraContainer(scontainer); err != nil {
return err
return sb, err
}

sb.SetCreated()
if err := label.ReserveLabel(processLabel); err != nil {
return err
return sb, err
}

sb.RestoreStopped()

if err := c.ctrIDIndex.Add(scontainer.ID()); err != nil {
return err
return sb, err
}
defer func() {
if retErr != nil {
Expand All @@ -322,9 +322,9 @@ func (c *ContainerServer) LoadSandbox(ctx context.Context, id string) (retErr er
}
}()
if err := c.podIDIndex.Add(id); err != nil {
return err
return sb, err
}
return nil
return sb, nil
}

func configNsPath(spec *rspec.Spec, nsType rspec.LinuxNamespaceType) (string, error) {
Expand Down
45 changes: 30 additions & 15 deletions internal/lib/container_server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,9 +147,10 @@ var _ = t.Describe("ContainerServer", func() {
mockDirs(testManifest)

// When
err := sut.LoadSandbox(context.Background(), "id")
sb, err := sut.LoadSandbox(context.Background(), "id")

// Then
Expect(sb).NotTo(BeNil())
Expect(err).To(BeNil())
})

Expand All @@ -163,9 +164,10 @@ var _ = t.Describe("ContainerServer", func() {
mockDirs(manifest)

// When
err := sut.LoadSandbox(context.Background(), "id")
sb, err := sut.LoadSandbox(context.Background(), "id")

// Then
Expect(sb).NotTo(BeNil())
Expect(err).To(BeNil())
})

Expand All @@ -179,9 +181,10 @@ var _ = t.Describe("ContainerServer", func() {
mockDirs(manifest)

// When
err := sut.LoadSandbox(context.Background(), "id")
sb, err := sut.LoadSandbox(context.Background(), "id")

// Then
Expect(sb).NotTo(BeNil())
Expect(err).To(BeNil())
})

Expand All @@ -190,9 +193,10 @@ var _ = t.Describe("ContainerServer", func() {
mockDirs(testManifest)

// When
err := sut.LoadSandbox(context.Background(), "")
sb, err := sut.LoadSandbox(context.Background(), "")

// Then
Expect(sb).NotTo(BeNil())
Expect(err).NotTo(BeNil())
})

Expand All @@ -205,9 +209,10 @@ var _ = t.Describe("ContainerServer", func() {
mockDirs(manifest)

// When
err := sut.LoadSandbox(context.Background(), "id")
sb, err := sut.LoadSandbox(context.Background(), "id")

// Then
Expect(sb).NotTo(BeNil())
Expect(err).NotTo(BeNil())
})

Expand All @@ -220,9 +225,10 @@ var _ = t.Describe("ContainerServer", func() {
mockDirs(manifest)

// When
err := sut.LoadSandbox(context.Background(), "id")
sb, err := sut.LoadSandbox(context.Background(), "id")

// Then
Expect(sb).NotTo(BeNil())
Expect(err).NotTo(BeNil())
})

Expand All @@ -239,9 +245,10 @@ var _ = t.Describe("ContainerServer", func() {
)

// When
err := sut.LoadSandbox(context.Background(), "id")
sb, err := sut.LoadSandbox(context.Background(), "id")

// Then
Expect(sb).NotTo(BeNil())
Expect(err).NotTo(BeNil())
})

Expand All @@ -256,9 +263,10 @@ var _ = t.Describe("ContainerServer", func() {
)

// When
err := sut.LoadSandbox(context.Background(), "id")
sb, err := sut.LoadSandbox(context.Background(), "id")

// Then
Expect(sb).NotTo(BeNil())
Expect(err).NotTo(BeNil())
})

Expand All @@ -275,9 +283,10 @@ var _ = t.Describe("ContainerServer", func() {
)

// When
err := sut.LoadSandbox(context.Background(), "id")
sb, err := sut.LoadSandbox(context.Background(), "id")

// Then
Expect(sb).To(BeNil())
Expect(err).NotTo(BeNil())
})

Expand All @@ -294,9 +303,10 @@ var _ = t.Describe("ContainerServer", func() {
)

// When
err := sut.LoadSandbox(context.Background(), "id")
sb, err := sut.LoadSandbox(context.Background(), "id")

// Then
Expect(sb).To(BeNil())
Expect(err).NotTo(BeNil())
})

Expand All @@ -313,9 +323,10 @@ var _ = t.Describe("ContainerServer", func() {
)

// When
err := sut.LoadSandbox(context.Background(), "id")
sb, err := sut.LoadSandbox(context.Background(), "id")

// Then
Expect(sb).To(BeNil())
Expect(err).NotTo(BeNil())
})

Expand All @@ -332,9 +343,10 @@ var _ = t.Describe("ContainerServer", func() {
)

// When
err := sut.LoadSandbox(context.Background(), "id")
sb, err := sut.LoadSandbox(context.Background(), "id")

// Then
Expect(sb).To(BeNil())
Expect(err).NotTo(BeNil())
})

Expand All @@ -351,9 +363,10 @@ var _ = t.Describe("ContainerServer", func() {
)

// When
err := sut.LoadSandbox(context.Background(), "id")
sb, err := sut.LoadSandbox(context.Background(), "id")

// Then
Expect(sb).To(BeNil())
Expect(err).NotTo(BeNil())
})

Expand All @@ -370,9 +383,10 @@ var _ = t.Describe("ContainerServer", func() {
)

// When
err := sut.LoadSandbox(context.Background(), "id")
sb, err := sut.LoadSandbox(context.Background(), "id")

// Then
Expect(sb).NotTo(BeNil())
Expect(err).NotTo(BeNil())
})

Expand All @@ -385,9 +399,10 @@ var _ = t.Describe("ContainerServer", func() {
)

// When
err := sut.LoadSandbox(context.Background(), "id")
sb, err := sut.LoadSandbox(context.Background(), "id")

// Then
Expect(sb).To(BeNil())
Expect(err).NotTo(BeNil())
})
})
Expand Down
Loading