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

Skip to content

server: refactor handling of cleanup funcs #4241

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
haircommander merged 2 commits into from
Dec 2, 2020
Merged

server: refactor handling of cleanup funcs #4241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7244e40
server: refactor handling of cleanup funcs
haircommander Oct 2, 2020
8dd12dc
fix cleanup func wording
haircommander Nov 20, 2020
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
61 changes: 32 additions & 29 deletions server/container_create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,50 +476,53 @@ func (s *Server) CreateContainer(ctx context.Context, req *pb.CreateContainerReq
return nil, errors.Wrap(err, "setting container name and ID")
}

cleanupFuncs := make([]func(), 0)
Copy link
Collaborator

@kolyshkin kolyshkin Nov 20, 2020

Choose a reason for hiding this comment

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

I think , 0 is redundant

Copy link
Member Author

@haircommander haircommander Nov 20, 2020

Choose a reason for hiding this comment

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

you need to specify a length when initializing a slice

Copy link
Collaborator

@kolyshkin kolyshkin Nov 20, 2020

Choose a reason for hiding this comment

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

Right, I always forget about this.

cleanupFuncs := []func(){}

maybe?

Copy link
Member Author

@haircommander haircommander Nov 23, 2020

Choose a reason for hiding this comment

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

is there any reason that is better than using make (which feels more idiomatic to me)

defer func() {
// no error, no need to cleanup
if retErr == nil {
return
}
for i := len(cleanupFuncs) - 1; i >= 0; i-- {
cleanupFuncs[i]()
}
}()

if _, err = s.ReserveContainerName(ctr.ID(), ctr.Name()); err != nil {
return nil, errors.Wrap(err, "Kubelet may be retrying requests that are timing out in CRI-O due to system load")
}

defer func() {
if retErr != nil {
log.Infof(ctx, "createCtr: releasing container name %s", ctr.Name())
s.ReleaseContainerName(ctr.Name())
}
}()
cleanupFuncs = append(cleanupFuncs, func() {
log.Infof(ctx, "createCtr: releasing container name %s", ctr.Name())
s.ReleaseContainerName(ctr.Name())
})

newContainer, err := s.createSandboxContainer(ctx, ctr, sb)
if err != nil {
return nil, err
}
defer func() {
if retErr != nil {
log.Infof(ctx, "createCtr: deleting container %s from storage", ctr.ID())
err2 := s.StorageRuntimeServer().DeleteContainer(ctr.ID())
if err2 != nil {
log.Warnf(ctx, "Failed to cleanup container directory: %v", err2)
}
cleanupFuncs = append(cleanupFuncs, func() {
log.Infof(ctx, "createCtr: deleting container %s from storage", ctr.ID())
err2 := s.StorageRuntimeServer().DeleteContainer(ctr.ID())
if err2 != nil {
log.Warnf(ctx, "Failed to cleanup container storage: %v", err2)
}
}()
})

s.addContainer(newContainer)
defer func() {
if retErr != nil {
log.Infof(ctx, "createCtr: removing container %s", newContainer.ID())
s.removeContainer(newContainer)
}
}()
cleanupFuncs = append(cleanupFuncs, func() {
log.Infof(ctx, "createCtr: removing container %s", newContainer.ID())
s.removeContainer(newContainer)
})

if err := s.CtrIDIndex().Add(ctr.ID()); err != nil {
return nil, err
}
defer func() {
if retErr != nil {
log.Infof(ctx, "createCtr: deleting container ID %s from idIndex", ctr.ID())
if err := s.CtrIDIndex().Delete(ctr.ID()); err != nil {
log.Warnf(ctx, "couldn't delete ctr id %s from idIndex", ctr.ID())
}
cleanupFuncs = append(cleanupFuncs, func() {
log.Infof(ctx, "createCtr: deleting container ID %s from idIndex", ctr.ID())
if err := s.CtrIDIndex().Delete(ctr.ID()); err != nil {
log.Warnf(ctx, "couldn't delete ctr id %s from idIndex", ctr.ID())
}
}()
})

mappings, err := s.getSandboxIDMappings(sb)
if err != nil {
Expand All @@ -529,14 +532,14 @@ func (s *Server) CreateContainer(ctx context.Context, req *pb.CreateContainerReq
if err := s.createContainerPlatform(newContainer, sb.CgroupParent(), mappings); err != nil {
return nil, err
}
defer func() {
cleanupFuncs = append(cleanupFuncs, func() {
if retErr != nil {
log.Infof(ctx, "createCtr: removing container ID %s from runtime", ctr.ID())
if err := s.Runtime().DeleteContainer(newContainer); err != nil {
log.Warnf(ctx, "failed to delete container in runtime %s: %v", ctr.ID(), err)
}
}
}()
})

if err := s.ContainerStateToDisk(newContainer); err != nil {
log.Warnf(ctx, "unable to write containers %s state to disk: %v", newContainer.ID(), err)
Expand Down
Loading