Merge pull request #1554 from kiashok/terminateOnTimeout

[release/0.9] Call container.Terminate() on shutdown timeouts
microsoft · Oct 31, 2022 · e0b7d33 · e0b7d33
2 parents 32d7d56 + cdc012c
commit e0b7d33
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/cmd/containerd-shim-runhcs-v1/task_hcs.go b/cmd/containerd-shim-runhcs-v1/task_hcs.go
@@ -778,7 +778,8 @@ func (ht *hcsTask) close(ctx context.Context) {
 						log.G(ctx).WithError(err).Error("failed to wait for container shutdown")
 					}
 				case <-t.C:
-					log.G(ctx).WithError(hcs.ErrTimeout).Error("failed to wait for container shutdown")
+					err = hcs.ErrTimeout
+					log.G(ctx).WithError(err).Error("failed to wait for container shutdown")
 				}
 			}