libct: replace runType with hasInit

kolyshkin · kolyshkin · commit d9f2a24a5ba6 · 2023-11-27T09:15:39.000-08:00
The semantics of runType is slightly complicated, and the only place
where we need to distinguish between Created and Running is
refreshState.

Replace runType with simpler hasInit, simplifying its users (except the
refreshState, which now figures out on its own whether the container is
Created or Running).

Signed-off-by: Kir Kolyshkin &lt;kolyshkin@gmail.com&gt;
diff --git a/libcontainer/container_linux.go b/libcontainer/container_linux.go
@@ -115,7 +115,7 @@ func (c *Container) ignoreCgroupError(err error) error {
 	if err == nil {
 		return nil
 	}
-	if errors.Is(err, os.ErrNotExist) && c.runType() == Stopped && !c.cgroupManager.Exists() {
+	if errors.Is(err, os.ErrNotExist) && !c.hasInit() && !c.cgroupManager.Exists() {
 		return nil
 	}
 	return err
@@ -1006,34 +1006,31 @@ func (c *Container) refreshState() error {
 	if paused {
 		return c.state.transition(&pausedState{c: c})
 	}
-	t := c.runType()
-	switch t {
-	case Created:
+	if !c.hasInit() {
+		return c.state.transition(&stoppedState{c: c})
+	}
+	// The presence of exec fifo helps to distinguish between
+	// the created and the running states.
+	if _, err := os.Stat(filepath.Join(c.stateDir, execFifoFilename)); err == nil {
 		return c.state.transition(&createdState{c: c})
-	case Running:
-		return c.state.transition(&runningState{c: c})
 	}
-	return c.state.transition(&stoppedState{c: c})
+	return c.state.transition(&runningState{c: c})
 }
 
-func (c *Container) runType() Status {
+// hasInit tells whether the container init process exists.
+func (c *Container) hasInit() bool {
 	if c.initProcess == nil {
-		return Stopped
+		return false
 	}
 	pid := c.initProcess.pid()
 	stat, err := system.Stat(pid)
 	if err != nil {
-		return Stopped
+		return false
 	}
 	if stat.StartTime != c.initProcessStartTime || stat.State == system.Zombie || stat.State == system.Dead {
-		return Stopped
-	}
-	// We'll create exec fifo and blocking on it after container is created,
-	// and delete it after start container.
-	if _, err := os.Stat(filepath.Join(c.stateDir, execFifoFilename)); err == nil {
-		return Created
+		return false
 	}
-	return Running
+	return true
 }
 
 func (c *Container) isPaused() (bool, error) {
diff --git a/libcontainer/state_linux.go b/libcontainer/state_linux.go
@@ -103,7 +103,7 @@ func (r *runningState) status() Status {
 func (r *runningState) transition(s containerState) error {
 	switch s.(type) {
 	case *stoppedState:
-		if r.c.runType() == Running {
+		if r.c.hasInit() {
 			return ErrRunning
 		}
 		r.c.state = s
@@ -118,7 +118,7 @@ func (r *runningState) transition(s containerState) error {
 }
 
 func (r *runningState) destroy() error {
-	if r.c.runType() == Running {
+	if r.c.hasInit() {
 		return ErrRunning
 	}
 	return destroy(r.c)
@@ -170,14 +170,13 @@ func (p *pausedState) transition(s containerState) error {
 }
 
 func (p *pausedState) destroy() error {
-	t := p.c.runType()
-	if t != Running && t != Created {
-		if err := p.c.cgroupManager.Freeze(configs.Thawed); err != nil {
-			return err
-		}
-		return destroy(p.c)
+	if p.c.hasInit() {
+		return ErrPaused
+	}
+	if err := p.c.cgroupManager.Freeze(configs.Thawed); err != nil {
+		return err
 	}
-	return ErrPaused
+	return destroy(p.c)
 }
 
 // restoredState is the same as the running state but also has associated checkpoint

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ func (r *runningState) status() Status {`
`103`	`103`	`func (r *runningState) transition(s containerState) error {`
`104`	`104`	`switch s.(type) {`
`105`	`105`	`case *stoppedState:`
`106`		`- if r.c.runType() == Running {`
	`106`	`+ if r.c.hasInit() {`
`107`	`107`	`return ErrRunning`
`108`	`108`	`}`
`109`	`109`	`r.c.state = s`
`@@ -118,7 +118,7 @@ func (r *runningState) transition(s containerState) error {`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`func (r *runningState) destroy() error {`
`121`		`- if r.c.runType() == Running {`
	`121`	`+ if r.c.hasInit() {`
`122`	`122`	`return ErrRunning`
`123`	`123`	`}`
`124`	`124`	`return destroy(r.c)`
`@@ -170,14 +170,13 @@ func (p *pausedState) transition(s containerState) error {`
`170`	`170`	`}`
`171`	`171`
`172`	`172`	`func (p *pausedState) destroy() error {`
`173`		`- t := p.c.runType()`
`174`		`- if t != Running && t != Created {`
`175`		`- if err := p.c.cgroupManager.Freeze(configs.Thawed); err != nil {`
`176`		`- return err`
`177`		`- }`
`178`		`- return destroy(p.c)`
	`173`	`+ if p.c.hasInit() {`
	`174`	`+ return ErrPaused`
	`175`	`+ }`
	`176`	`+ if err := p.c.cgroupManager.Freeze(configs.Thawed); err != nil {`
	`177`	`+ return err`
`179`	`178`	`}`
`180`		`- return ErrPaused`
	`179`	`+ return destroy(p.c)`
`181`	`180`	`}`
`182`	`181`
`183`	`182`	`// restoredState is the same as the running state but also has associated checkpoint`