feat: get prestart hooks working better

README.md

@@ -162,6 +162,8 @@ My goal is for `brownie` to (eventually) pass all test suites in the [opencontai
 - [x] kill_no_effect
 - [x] linux_mount_label
 - [x] linux_sysctl
+- [x] prestart
+- [x] prestart_fail
 - [x] process
 - [x] process_capabilities
 - [x] start
@@ -206,8 +208,6 @@ My goal is for `brownie` to (eventually) pass all test suites in the [opencontai
 - [ ] poststart_fail
 - [ ] poststop
 - [ ] poststop_fail
-- [ ] prestart
-- [ ] prestart_fail
 - [ ] process_capabilities_fail
 - [ ] process_oom_score_adj
 - [ ] process_rlimits

internal/commands/delete.go

@@ -41,6 +41,7 @@ func Delete(opts *DeleteOpts, log *zerolog.Logger, db *sql.DB) error {
 		return errors.New("didn't delete container for whatever reason")
 	}
 
+	log.Info().Msg("execing poststop hooks")
 	if err := cntr.ExecHooks("poststop"); err != nil {
 		log.Warn().Err(err).Msg("failed to execute poststop hooks")
 	}

internal/commands/start.go

@@ -51,6 +51,22 @@ func Start(opts *StartOpts, log *zerolog.Logger, db *sql.DB) error {
 		return fmt.Errorf("dial socket: %w", err)
 	}
 
+	if err := cntr.ExecHooks("prestart"); err != nil {
+		log.Error().Err(err).Msg("failed to execute prestart hooks")
+		cntr.State.Status = specs.StateStopped
+		cntr.Save()
+		log.Info().Msg("BEFORE FAIL DELETE")
+
+		// TODO: run DELETE tasks here, then...
+
+		log.Info().Msg("execing poststop hooks")
+		if err := cntr.ExecHooks("poststop"); err != nil {
+			log.Warn().Err(err).Msg("failed to execute poststop hooks")
+		}
+
+		return errors.New("failed to run prestart hooks")
+	}
+
 	if _, err := conn.Write([]byte("start")); err != nil {
 		log.Error().Err(err).Msg("failed to send start message")
 		return fmt.Errorf("send start over ipc: %w", err)
@@ -59,10 +75,6 @@ func Start(opts *StartOpts, log *zerolog.Logger, db *sql.DB) error {
 
 	// FIXME: ?? when process starts, the PID in state should be updated to the process IN the container??
 
-	if err := cntr.ExecHooks("poststart"); err != nil {
-		log.Warn().Err(err).Msg("failed to execute poststart hooks")
-	}
-
 	// cntr.State.Status = specs.StateStopped
 	// if err := cntr.Save(); err != nil {
 	// 	log.Error().Err(err).Msg("save state after stopped")

internal/container/container.go

@@ -360,12 +360,7 @@ func (c *Container) Fork(opts *ForkOpts, log *zerolog.Logger, db *sql.DB) error
 
 	c.initIPC.ch <- []byte("ready")
 
-	return ipc.WaitForMsg(listCh, "start", func() error {
-		if err := c.ExecHooks("prestart"); err != nil {
-			log.Error().Err(err).Msg("failed to execute prestart hooks")
-			return fmt.Errorf("execute prestart hooks: %w", err)
-		}
-
+	startErr := ipc.WaitForMsg(listCh, "start", func() error {
 		if err := filesystem.PivotRoot(c.State.Bundle); err != nil {
 			log.Error().Err(err).Msg("failed to pivot root")
 			return err
@@ -454,8 +449,15 @@ func (c *Container) Fork(opts *ForkOpts, log *zerolog.Logger, db *sql.DB) error
 		}
 		log.Info().Msg("UPDATED STATE FILE")
 
+		// if err := c.ExecHooks("poststart"); err != nil {
+		// 	log.Warn().Err(err).Msg("failed to execute poststart hooks")
+		// 	// TODO: how to handle this (log a warning) from start command??
+		// }
+
 		return nil
 	})
+
+	return startErr
 }
 
 func Load(id string, log *zerolog.Logger, db *sql.DB) (*Container, error) {
@@ -562,6 +564,7 @@ func (c *Container) ExecHooks(hook string) error {
 	var specHooks []specs.Hook
 	switch hook {
 	case "prestart":
+		//lint:ignore SA1019 marked as deprecated, but still required by OCI Runtime integration tests
 		specHooks = c.Spec.Hooks.Prestart
 	case "createRuntime":
 		specHooks = c.Spec.Hooks.CreateRuntime

oci.sh

@@ -12,6 +12,7 @@ RUNTIME=${RUNTIME:-./brownie}
 ./validation/linux_sysctl/linux_sysctl.t 2>&1 | tee -a results.tap
 # ./validation/pidfile/pidfile.t 2>&1 | tee -a results.tap
 ./validation/prestart/prestart.t 2>&1 | tee -a results.tap
+./validation/prestart_fail/prestart_fail.t 2>&1 | tee -a results.tap
 ./validation/process/process.t 2>&1 | tee -a results.tap
 ./validation/process_capabilities/process_capabilities.t 2>&1 | tee -a results.tap
 ./validation/start/start.t 2>&1 | tee -a results.tap