beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Move StartedAt time to before starting the container

Browse source 
Signed-off-by: Lars Andringa <l.s.andringa@rug.nl>
Signed-off-by: LarsSven <l.s.andringa@rug.nl>

Replaced boolean parameter by IsZero check

Signed-off-by: LarsSven <l.s.andringa@rug.nl>

Separated SetRunning into two functions

Signed-off-by: LarsSven <l.s.andringa@rug.nl>

Apply suggestions from code review

Documentation fixes

Co-authored-by: Paweł Gronowski <me@woland.xyz>
Signed-off-by: LarsSven <l.s.andringa@rug.nl>
This commit is contained in:
Lars Andringa 2023-12-30 15:32:53 +01:00 committed by LarsSven
parent 341e7b35a6
commit d4f61f92fd
6 changed files with 25 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
container/state.go
View file

@ -268,13 +268,23 @@ func (s *State) SetExitCode(ec int) {
s.ExitCodeValue = ec
}
// SetRunning sets the state of the container to "running".
func (s *State) SetRunning(ctr libcontainerdtypes.Container, tsk libcontainerdtypes.Task, initial bool) {
// SetRunning sets the running state along with StartedAt time.
func (s *State) SetRunning(ctr libcontainerdtypes.Container, tsk libcontainerdtypes.Task, start time.Time) {
s.setRunning(ctr, tsk, &start)
}
// SetRunningExternal sets the running state without setting the `StartedAt` time (used for containers not started by Docker instead of SetRunning).
func (s *State) SetRunningExternal(ctr libcontainerdtypes.Container, tsk libcontainerdtypes.Task) {
s.setRunning(ctr, tsk, nil)
}
// setRunning sets the state of the container to "running".
func (s *State) setRunning(ctr libcontainerdtypes.Container, tsk libcontainerdtypes.Task, start *time.Time) {
s.ErrorMsg = ""
s.Paused = false
s.Running = true
s.Restarting = false
if initial {
if start != nil {
s.Paused = false
}
s.ExitCodeValue = 0
@ -286,8 +296,8 @@ func (s *State) SetRunning(ctr libcontainerdtypes.Container, tsk libcontainerdty
s.Pid = 0
}
s.OOMKilled = false
if initial {
s.StartedAt = time.Now().UTC()
if start != nil {
s.StartedAt = start.UTC()
}
}

8
container/state_test.go
View file

@ -68,7 +68,7 @@ func TestStateRunStop(t *testing.T) {
// Set the state to "Running".
s.Lock()
s.SetRunning(nil, &mockTask{pid: uint32(i)}, true)
s.SetRunning(nil, &mockTask{pid: uint32(i)}, time.Now())
s.Unlock()
// Assert desired state.
@ -133,7 +133,7 @@ func TestStateTimeoutWait(t *testing.T) {
s := NewState()
s.Lock()
s.SetRunning(nil, nil, true)
s.SetRunning(nil, nil, time.Now())
s.Unlock()
// Start a wait with a timeout.
@ -182,7 +182,7 @@ func TestCorrectStateWaitResultAfterRestart(t *testing.T) {
s := NewState()
s.Lock()
s.SetRunning(nil, nil, true)
s.SetRunning(nil, nil, time.Now())
s.Unlock()
waitC := s.Wait(context.Background(), WaitConditionNotRunning)
@ -193,7 +193,7 @@ func TestCorrectStateWaitResultAfterRestart(t *testing.T) {
s.Unlock()
s.Lock()
s.SetRunning(nil, nil, true)
s.SetRunning(nil, nil, time.Now())
s.Unlock()
got := <-waitC

3
daemon/delete_test.go
View file

@ -4,6 +4,7 @@ import (
"fmt"
"os"
"testing"
"time"
"github.com/docker/docker/api/types/backend"
containertypes "github.com/docker/docker/api/types/container"
@ -52,7 +53,7 @@ func TestContainerDelete(t *testing.T) {
errMsg: "container is restarting: stop the container before removing or force remove",
initContainer: func() *container.Container {
c := newContainerWithState(container.NewState())
c.SetRunning(nil, nil, true)
c.SetRunning(nil, nil, time.Now())
c.SetRestarting(&container.ExitStatus{})
return c
},

2
daemon/monitor.go
View file

@ -254,7 +254,7 @@ func (daemon *Daemon) ProcessEvent(id string, e libcontainerdtypes.EventType, ei
}
return err
}
c.SetRunning(ctr, tsk, false)
c.SetRunningExternal(ctr, tsk)
c.HasBeenManuallyStopped = false
c.HasBeenStartedBefore = true
daemon.setStateCounter(c)

3
daemon/start.go
View file

@ -199,6 +199,7 @@ func (daemon *Daemon) containerStart(ctx context.Context, daemonCfg *configStore
return setExitCodeFromError(container.SetExitCode, err)
}
startupTime := time.Now()
// TODO(mlaventure): we need to specify checkpoint options here
tsk, err := ctr.Start(context.TODO(), // Passing ctx to ctr.Start caused integration tests to be stuck in the cleanup phase
checkpointDir, container.StreamConfig.Stdin() != nil || container.Config.Tty,
@ -212,7 +213,7 @@ func (daemon *Daemon) containerStart(ctx context.Context, daemonCfg *configStore
}
container.HasBeenManuallyRestarted = false
container.SetRunning(ctr, tsk, true)
container.SetRunning(ctr, tsk, startupTime)
container.HasBeenStartedBefore = true
daemon.setStateCounter(container)

2
integration/container/daemon_linux_test.go
View file

@ -256,7 +256,7 @@ func TestHardRestartWhenContainerIsRunning(t *testing.T) {
for _, id := range []string{noPolicy, onFailure} {
d.TamperWithContainerConfig(t, id, func(c *realcontainer.Container) {
c.SetRunning(nil, nil, true)
c.SetRunning(nil, nil, time.Now())
c.HasBeenStartedBefore = true
})
}