Merge pull request #3149 from lifubang/pidnamespace

crosbymichael · web-flow · commit 57fbb16234fa · 2019-05-09T14:28:44.000-04:00
fix killall when use pidnamespace
diff --git a/runtime/v1/shim/service.go b/runtime/v1/shim/service.go
@@ -554,7 +554,7 @@ func shouldKillAllOnExit(bundlePath string) (bool, error) {
 
 	if bundleSpec.Linux != nil {
 		for _, ns := range bundleSpec.Linux.Namespaces {
-			if ns.Type == specs.PIDNamespace {
+			if ns.Type == specs.PIDNamespace && ns.Path == "" {
 				return false, nil
 			}
 		}
diff --git a/runtime/v2/runc/v2/service.go b/runtime/v2/runc/v2/service.go
@@ -658,7 +658,7 @@ func shouldKillAllOnExit(bundlePath string) (bool, error) {
 
 	if bundleSpec.Linux != nil {
 		for _, ns := range bundleSpec.Linux.Namespaces {
-			if ns.Type == specs.PIDNamespace {
+			if ns.Type == specs.PIDNamespace && ns.Path == "" {
 				return false, nil
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -554,7 +554,7 @@ func shouldKillAllOnExit(bundlePath string) (bool, error) {`
`554`	`554`
`555`	`555`	`if bundleSpec.Linux != nil {`
`556`	`556`	`for _, ns := range bundleSpec.Linux.Namespaces {`
`557`		`- if ns.Type == specs.PIDNamespace {`
	`557`	`+ if ns.Type == specs.PIDNamespace && ns.Path == "" {`
`558`	`558`	`return false, nil`
`559`	`559`	`}`
`560`	`560`	`}`
Original file line number	Diff line number	Diff line change
`@@ -658,7 +658,7 @@ func shouldKillAllOnExit(bundlePath string) (bool, error) {`
`658`	`658`
`659`	`659`	`if bundleSpec.Linux != nil {`
`660`	`660`	`for _, ns := range bundleSpec.Linux.Namespaces {`
`661`		`- if ns.Type == specs.PIDNamespace {`
	`661`	`+ if ns.Type == specs.PIDNamespace && ns.Path == "" {`
`662`	`662`	`return false, nil`
`663`	`663`	`}`
`664`	`664`	`}`