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

Address PR comments

Browse Source 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
This commit is contained in:
Maksym Pavlenko
2021-11-02 11:19:43 -07:00
parent 6fa1bb4a5c
commit d022fbe789
2 changed files with 30 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
runtime/v2/shim_load.go
View File

@@ -107,15 +107,15 @@ func (m *ShimManager) loadShims(ctx context.Context) error {
shim, err := loadShim(ctx, bundle, func() {
log.G(ctx).WithField("id", id).Info("shim disconnected")
cleanupAfterDeadShim(context.Background(), id, ns, m.list, m.events, binaryCall)
cleanupAfterDeadShim(context.Background(), id, ns, m.shims, m.events, binaryCall)
// Remove self from the runtime task list.
m.list.Delete(ctx, id)
m.shims.Delete(ctx, id)
})
if err != nil {
cleanupAfterDeadShim(ctx, id, ns, m.list, m.events, binaryCall)
cleanupAfterDeadShim(ctx, id, ns, m.shims, m.events, binaryCall)
continue
}
m.list.Add(ctx, shim)
m.shims.Add(ctx, shim)
}
return nil
}
@@ -133,7 +133,7 @@ func (m *ShimManager) cleanupWorkDirs(ctx context.Context) error {
// if the task was not loaded, cleanup and empty working directory
// this can happen on a reboot where /run for the bundle state is cleaned up
// but that persistent working dir is left
if _, err := m.list.Get(ctx, d.Name()); err != nil {
if _, err := m.shims.Get(ctx, d.Name()); err != nil {
path := filepath.Join(m.root, ns, d.Name())
if err := os.RemoveAll(path); err != nil {
log.G(ctx).WithError(err).Errorf("cleanup working dir %s", path)