v2: Close ttrpc connection when Delete()

darfux · darfux · commit 08483d18adea · 2019-08-06T20:35:59.000+08:00
This avoids potential socket leak when the connected v2 shim of runtime
serving multiple containers.

Signed-off-by: Li Yuxuan &lt;liyuxuan04@baidu.com&gt;
diff --git a/runtime/v2/shim.go b/runtime/v2/shim.go
@@ -221,6 +221,7 @@ func (s *shim) Delete(ctx context.Context) (*runtime.Exit, error) {
 	if err := s.waitShutdown(ctx); err != nil {
 		log.G(ctx).WithError(err).Error("failed to shutdown shim")
 	}
+	s.Close()
 	if err := s.bundle.Delete(); err != nil {
 		log.G(ctx).WithError(err).Error("failed to delete bundle")
 	}

Original file line number	Diff line number	Diff line change
`@@ -221,6 +221,7 @@ func (s shim) Delete(ctx context.Context) (runtime.Exit, error) {`
`221`	`221`	`if err := s.waitShutdown(ctx); err != nil {`
`222`	`222`	`log.G(ctx).WithError(err).Error("failed to shutdown shim")`
`223`	`223`	`}`
	`224`	`+ s.Close()`
`224`	`225`	`if err := s.bundle.Delete(); err != nil {`
`225`	`226`	`log.G(ctx).WithError(err).Error("failed to delete bundle")`
`226`	`227`	`}`