libcontainer: call Prestart, Poststart hooks from correct places

So far Prestart, Poststart hooks have been called from the context
of create, which does not satisfy the runtime spec. That's why the
runtime-tools validation tests like `hooks_stdin.t` have failed.
Let's move call sites of Prestart, Poststart to correct places.

Unfortunately as for the Poststart hook, it's not possible to tell
whether a specific call site is from create context or run context.
That's why we needed to allow Create and Run methods to accept
another parameter `action` (of type `CtAct`). Doing that, it's possible
to set a variable `initProcess.IsCreate` that allows us distinguish
Create from Run.

It depends on a pending PR #1741.
See also #1710.

Signed-off-by: Dongsu Park <[email protected]>
Signed-off-by: Aleksa Sarai <[email protected]>

Author: Dongsu Park

libcontainer/container_linux.go

@@ -262,9 +262,25 @@ func (c *linuxContainer) Exec() error {
 	return c.exec()
 }
 
-func (c *linuxContainer) exec() error {
+func (c *linuxContainer) exec() (errExec error) {
 	path := filepath.Join(c.root, execFifoFilename)
 
+	if c.config.Hooks != nil && len(c.config.Hooks.Poststart) > 0 {
+		defer func() {
+			s, err := c.currentOCIState()
+			if err != nil {
+				errExec = err
+				return
+			}
+			for i, hook := range c.config.Hooks.Poststart {
+				if err := hook.Run(s); err != nil {
+					errExec = newSystemErrorWithCausef(err, "running poststart hook %d", i)
+					return
+				}
+			}
+		}()
+	}
+
 	fifoOpen := make(chan struct{})
 	select {
 	case <-awaitProcessExit(c.initProcess.pid(), fifoOpen):
@@ -355,17 +371,14 @@ func (c *linuxContainer) start(process *Process, isCreate bool) error {
 		}
 		c.initProcessStartTime = state.InitProcessStartTime
 
-		if c.config.Hooks != nil && len(c.config.Hooks.Poststart) > 0 {
+		if c.config.Hooks != nil && len(c.config.Hooks.Prestart) > 0 {
 			s, err := c.currentOCIState()
 			if err != nil {
 				return err
 			}
-			for i, hook := range c.config.Hooks.Poststart {
+			for i, hook := range c.config.Hooks.Prestart {
 				if err := hook.Run(s); err != nil {
-					if err := ignoreTerminateErrors(parent.terminate()); err != nil {
-						logrus.Warn(err)
-					}
-					return newSystemErrorWithCausef(err, "running poststart hook %d", i)
+					return newSystemErrorWithCausef(err, "running prestart hook %d", i)
 				}
 			}
 		}

libcontainer/process_linux.go

@@ -345,6 +345,21 @@ func (p *initProcess) start() error {
 		sentResume bool
 	)
 
+	// runc start
+	if !p.IsCreate {
+		if p.config.Config.Hooks != nil && len(p.config.Config.Hooks.Poststart) > 0 {
+			s, err := p.container.currentOCIState()
+			if err != nil {
+				return err
+			}
+			for i, hook := range p.config.Config.Hooks.Poststart {
+				if err := hook.Run(s); err != nil {
+					return newSystemErrorWithCausef(err, "running poststart hook %d", i)
+				}
+			}
+		}
+	}
+
 	ierr := parseSync(p.parentPipe, func(sync *syncT) error {
 		switch sync.Type {
 		case procReady:
@@ -364,21 +379,6 @@ func (p *initProcess) start() error {
 						return newSystemErrorWithCause(err, "setting Intel RDT config for ready process")
 					}
 				}
-
-				if p.config.Config.Hooks != nil && len(p.config.Config.Hooks.Prestart) > 0 {
-					s, err := p.container.currentOCIState()
-					if err != nil {
-						return err
-					}
-					// initProcessStartTime hasn't been set yet.
-					s.Pid = p.cmd.Process.Pid
-					s.Status = "creating"
-					for i, hook := range p.config.Config.Hooks.Prestart {
-						if err := hook.Run(s); err != nil {
-							return newSystemErrorWithCausef(err, "running prestart hook %d", i)
-						}
-					}
-				}
 			}
 			// Sync with child.
 			if err := writeSync(p.parentPipe, procRun); err != nil {
@@ -395,20 +395,6 @@ func (p *initProcess) start() error {
 					return newSystemErrorWithCause(err, "setting Intel RDT config for procHooks process")
 				}
 			}
-			if p.config.Config.Hooks != nil && len(p.config.Config.Hooks.Prestart) > 0 {
-				s, err := p.container.currentOCIState()
-				if err != nil {
-					return err
-				}
-				// initProcessStartTime hasn't been set yet.
-				s.Pid = p.cmd.Process.Pid
-				s.Status = "creating"
-				for i, hook := range p.config.Config.Hooks.Prestart {
-					if err := hook.Run(s); err != nil {
-						return newSystemErrorWithCausef(err, "running prestart hook %d", i)
-					}
-				}
-			}
 			// Sync with child.
 			if err := writeSync(p.parentPipe, procResume); err != nil {
 				return newSystemErrorWithCause(err, "writing syncT 'resume'")