Merge pull request #1944 from Ace-Tang/criu_notify_pid

crosbymichael · web-flow · commit ff38d6e7ccba · 2018-12-03T10:35:58.000-05:00
cr: get pid from criu notify when restore
diff --git a/libcontainer/container_linux.go b/libcontainer/container_linux.go
@@ -1554,6 +1554,7 @@ func (c *linuxContainer) criuNotifications(resp *criurpc.CriuResp, process *Proc
 			if err != nil {
 				return nil
 			}
+			s.Pid = int(notify.GetPid())
 			for i, hook := range c.config.Hooks.Prestart {
 				if err := hook.Run(s); err != nil {
 					return newSystemErrorWithCausef(err, "running prestart hook %d", i)

Original file line number	Diff line number	Diff line change
`@@ -1554,6 +1554,7 @@ func (c linuxContainer) criuNotifications(resp criurpc.CriuResp, process *Proc`
`1554`	`1554`	`if err != nil {`
`1555`	`1555`	`return nil`
`1556`	`1556`	`}`
	`1557`	`+ s.Pid = int(notify.GetPid())`
`1557`	`1558`	`for i, hook := range c.config.Hooks.Prestart {`
`1558`	`1559`	`if err := hook.Run(s); err != nil {`
`1559`	`1560`	`return newSystemErrorWithCausef(err, "running prestart hook %d", i)`