Merge pull request #1641 from adisky/release/1.4

containerd · Jun 19, 2021 · 3b02bec · 3b02bec
2 parents 4cc8ca2 + f3ae4a5
commit 3b02bec
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/pkg/server/sandbox_run.go b/pkg/server/sandbox_run.go
@@ -124,8 +124,10 @@ func (c *criService) RunPodSandbox(ctx context.Context, r *runtime.RunPodSandbox
 		sandbox.NetNSPath = sandbox.NetNS.GetPath()
 		defer func() {
 			if retErr != nil {
+				deferCtx, deferCancel := ctrdutil.DeferContext()
+				defer deferCancel()
 				// Teardown network if an error is returned.
-				if err := c.teardownPodNetwork(ctx, sandbox); err != nil {
+				if err := c.teardownPodNetwork(deferCtx, sandbox); err != nil {
 					log.G(ctx).WithError(err).Errorf("Failed to destroy network for sandbox %q", id)
 				}