mirror of
https://github.com/containers/podman.git
synced 2025-06-21 09:28:09 +08:00
Add more checkpoint/restore information to 'inspect'
This adds the following information to the output of 'podman inspect': * CheckpointedAt - time the container was checkpointed Only set if the container has been checkpointed * RestoredAt - time the container was restored Only set if the container has been restored * CheckpointLog - path to the checkpoint log file (CRIU's dump.log) Only set if the log file exists (--keep) * RestoreLog - path to the restore log file (CRIU's restore.log) Only set if the log file exists (--keep) * CheckpointPath - path to the actual (CRIU) checkpoint files Only set if the checkpoint files exists (--keep) * Restored - set to true if the container has been restored Only set if the container has been restored Signed-off-by: Adrian Reber <areber@redhat.com>
This commit is contained in:
@ -213,6 +213,15 @@ type ContainerState struct {
|
|||||||
|
|
||||||
// containerPlatformState holds platform-specific container state.
|
// containerPlatformState holds platform-specific container state.
|
||||||
containerPlatformState
|
containerPlatformState
|
||||||
|
|
||||||
|
// Following checkpoint/restore related information is displayed
|
||||||
|
// if the container has been checkpointed or restored.
|
||||||
|
CheckpointedTime time.Time `json:"checkpointedTime,omitempty"`
|
||||||
|
RestoredTime time.Time `json:"restoredTime,omitempty"`
|
||||||
|
CheckpointLog string `json:"checkpointLog,omitempty"`
|
||||||
|
CheckpointPath string `json:"checkpointPath,omitempty"`
|
||||||
|
RestoreLog string `json:"restoreLog,omitempty"`
|
||||||
|
Restored bool `json:"restored,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// ContainerNamedVolume is a named volume that will be mounted into the
|
// ContainerNamedVolume is a named volume that will be mounted into the
|
||||||
|
@ -113,20 +113,26 @@ func (c *Container) getContainerInspectData(size bool, driverData *define.Driver
|
|||||||
Path: path,
|
Path: path,
|
||||||
Args: args,
|
Args: args,
|
||||||
State: &define.InspectContainerState{
|
State: &define.InspectContainerState{
|
||||||
OciVersion: ctrSpec.Version,
|
OciVersion: ctrSpec.Version,
|
||||||
Status: runtimeInfo.State.String(),
|
Status: runtimeInfo.State.String(),
|
||||||
Running: runtimeInfo.State == define.ContainerStateRunning,
|
Running: runtimeInfo.State == define.ContainerStateRunning,
|
||||||
Paused: runtimeInfo.State == define.ContainerStatePaused,
|
Paused: runtimeInfo.State == define.ContainerStatePaused,
|
||||||
OOMKilled: runtimeInfo.OOMKilled,
|
OOMKilled: runtimeInfo.OOMKilled,
|
||||||
Dead: runtimeInfo.State.String() == "bad state",
|
Dead: runtimeInfo.State.String() == "bad state",
|
||||||
Pid: runtimeInfo.PID,
|
Pid: runtimeInfo.PID,
|
||||||
ConmonPid: runtimeInfo.ConmonPID,
|
ConmonPid: runtimeInfo.ConmonPID,
|
||||||
ExitCode: runtimeInfo.ExitCode,
|
ExitCode: runtimeInfo.ExitCode,
|
||||||
Error: "", // can't get yet
|
Error: "", // can't get yet
|
||||||
StartedAt: runtimeInfo.StartedTime,
|
StartedAt: runtimeInfo.StartedTime,
|
||||||
FinishedAt: runtimeInfo.FinishedTime,
|
FinishedAt: runtimeInfo.FinishedTime,
|
||||||
Checkpointed: runtimeInfo.Checkpointed,
|
Checkpointed: runtimeInfo.Checkpointed,
|
||||||
CgroupPath: cgroupPath,
|
CgroupPath: cgroupPath,
|
||||||
|
RestoredAt: runtimeInfo.RestoredTime,
|
||||||
|
CheckpointedAt: runtimeInfo.CheckpointedTime,
|
||||||
|
Restored: runtimeInfo.Restored,
|
||||||
|
CheckpointPath: runtimeInfo.CheckpointPath,
|
||||||
|
CheckpointLog: runtimeInfo.CheckpointLog,
|
||||||
|
RestoreLog: runtimeInfo.RestoreLog,
|
||||||
},
|
},
|
||||||
Image: config.RootfsImageID,
|
Image: config.RootfsImageID,
|
||||||
ImageName: config.RootfsImageName,
|
ImageName: config.RootfsImageName,
|
||||||
|
@ -634,6 +634,12 @@ func resetState(state *ContainerState) {
|
|||||||
state.RestartPolicyMatch = false
|
state.RestartPolicyMatch = false
|
||||||
state.RestartCount = 0
|
state.RestartCount = 0
|
||||||
state.Checkpointed = false
|
state.Checkpointed = false
|
||||||
|
state.Restored = false
|
||||||
|
state.CheckpointedTime = time.Time{}
|
||||||
|
state.RestoredTime = time.Time{}
|
||||||
|
state.CheckpointPath = ""
|
||||||
|
state.CheckpointLog = ""
|
||||||
|
state.RestoreLog = ""
|
||||||
}
|
}
|
||||||
|
|
||||||
// Refresh refreshes the container's state after a restart.
|
// Refresh refreshes the container's state after a restart.
|
||||||
@ -1111,6 +1117,12 @@ func (c *Container) init(ctx context.Context, retainRetries bool) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
c.state.Checkpointed = false
|
c.state.Checkpointed = false
|
||||||
|
c.state.Restored = false
|
||||||
|
c.state.CheckpointedTime = time.Time{}
|
||||||
|
c.state.RestoredTime = time.Time{}
|
||||||
|
c.state.CheckpointPath = ""
|
||||||
|
c.state.CheckpointLog = ""
|
||||||
|
c.state.RestoreLog = ""
|
||||||
c.state.ExitCode = 0
|
c.state.ExitCode = 0
|
||||||
c.state.Exited = false
|
c.state.Exited = false
|
||||||
c.state.State = define.ContainerStateCreated
|
c.state.State = define.ContainerStateCreated
|
||||||
|
@ -1134,6 +1134,10 @@ func (c *Container) checkpoint(ctx context.Context, options ContainerCheckpointO
|
|||||||
return nil, 0, err
|
return nil, 0, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Setting CheckpointLog early in case there is a failure.
|
||||||
|
c.state.CheckpointLog = path.Join(c.bundlePath(), "dump.log")
|
||||||
|
c.state.CheckpointPath = c.CheckpointPath()
|
||||||
|
|
||||||
runtimeCheckpointDuration, err := c.ociRuntime.CheckpointContainer(c, options)
|
runtimeCheckpointDuration, err := c.ociRuntime.CheckpointContainer(c, options)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, 0, err
|
return nil, 0, err
|
||||||
@ -1169,6 +1173,9 @@ func (c *Container) checkpoint(ctx context.Context, options ContainerCheckpointO
|
|||||||
if !options.KeepRunning && !options.PreCheckPoint {
|
if !options.KeepRunning && !options.PreCheckPoint {
|
||||||
c.state.State = define.ContainerStateStopped
|
c.state.State = define.ContainerStateStopped
|
||||||
c.state.Checkpointed = true
|
c.state.Checkpointed = true
|
||||||
|
c.state.CheckpointedTime = time.Now()
|
||||||
|
c.state.Restored = false
|
||||||
|
c.state.RestoredTime = time.Time{}
|
||||||
|
|
||||||
// Cleanup Storage and Network
|
// Cleanup Storage and Network
|
||||||
if err := c.cleanup(ctx); err != nil {
|
if err := c.cleanup(ctx); err != nil {
|
||||||
@ -1216,6 +1223,8 @@ func (c *Container) checkpoint(ctx context.Context, options ContainerCheckpointO
|
|||||||
logrus.Debugf("Unable to remove file %s", file)
|
logrus.Debugf("Unable to remove file %s", file)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// The file has been deleted. Do not mention it.
|
||||||
|
c.state.CheckpointLog = ""
|
||||||
}
|
}
|
||||||
|
|
||||||
c.state.FinishedTime = time.Now()
|
c.state.FinishedTime = time.Now()
|
||||||
@ -1293,6 +1302,10 @@ func (c *Container) restore(ctx context.Context, options ContainerCheckpointOpti
|
|||||||
return nil, 0, err
|
return nil, 0, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Setting RestoreLog early in case there is a failure.
|
||||||
|
c.state.RestoreLog = path.Join(c.bundlePath(), "restore.log")
|
||||||
|
c.state.CheckpointPath = c.CheckpointPath()
|
||||||
|
|
||||||
// Read network configuration from checkpoint
|
// Read network configuration from checkpoint
|
||||||
var netStatus map[string]types.StatusBlock
|
var netStatus map[string]types.StatusBlock
|
||||||
_, err := metadata.ReadJSONFile(&netStatus, c.bundlePath(), metadata.NetworkStatusFile)
|
_, err := metadata.ReadJSONFile(&netStatus, c.bundlePath(), metadata.NetworkStatusFile)
|
||||||
@ -1559,6 +1572,9 @@ func (c *Container) restore(ctx context.Context, options ContainerCheckpointOpti
|
|||||||
|
|
||||||
c.state.State = define.ContainerStateRunning
|
c.state.State = define.ContainerStateRunning
|
||||||
c.state.Checkpointed = false
|
c.state.Checkpointed = false
|
||||||
|
c.state.Restored = true
|
||||||
|
c.state.CheckpointedTime = time.Time{}
|
||||||
|
c.state.RestoredTime = time.Now()
|
||||||
|
|
||||||
if !options.Keep {
|
if !options.Keep {
|
||||||
// Delete all checkpoint related files. At this point, in theory, all files
|
// Delete all checkpoint related files. At this point, in theory, all files
|
||||||
@ -1569,6 +1585,7 @@ func (c *Container) restore(ctx context.Context, options ContainerCheckpointOpti
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Debugf("Non-fatal: removal of checkpoint directory (%s) failed: %v", c.CheckpointPath(), err)
|
logrus.Debugf("Non-fatal: removal of checkpoint directory (%s) failed: %v", c.CheckpointPath(), err)
|
||||||
}
|
}
|
||||||
|
c.state.CheckpointPath = ""
|
||||||
err = os.RemoveAll(c.PreCheckPointPath())
|
err = os.RemoveAll(c.PreCheckPointPath())
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Debugf("Non-fatal: removal of pre-checkpoint directory (%s) failed: %v", c.PreCheckPointPath(), err)
|
logrus.Debugf("Non-fatal: removal of pre-checkpoint directory (%s) failed: %v", c.PreCheckPointPath(), err)
|
||||||
@ -1589,6 +1606,8 @@ func (c *Container) restore(ctx context.Context, options ContainerCheckpointOpti
|
|||||||
logrus.Debugf("Non-fatal: removal of checkpoint file (%s) failed: %v", file, err)
|
logrus.Debugf("Non-fatal: removal of checkpoint file (%s) failed: %v", file, err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
c.state.CheckpointLog = ""
|
||||||
|
c.state.RestoreLog = ""
|
||||||
}
|
}
|
||||||
|
|
||||||
return criuStatistics, runtimeRestoreDuration, c.save()
|
return criuStatistics, runtimeRestoreDuration, c.save()
|
||||||
|
@ -189,22 +189,28 @@ type InspectMount struct {
|
|||||||
// Docker, but here we see more fields that are unused (nonsensical in the
|
// Docker, but here we see more fields that are unused (nonsensical in the
|
||||||
// context of Libpod).
|
// context of Libpod).
|
||||||
type InspectContainerState struct {
|
type InspectContainerState struct {
|
||||||
OciVersion string `json:"OciVersion"`
|
OciVersion string `json:"OciVersion"`
|
||||||
Status string `json:"Status"`
|
Status string `json:"Status"`
|
||||||
Running bool `json:"Running"`
|
Running bool `json:"Running"`
|
||||||
Paused bool `json:"Paused"`
|
Paused bool `json:"Paused"`
|
||||||
Restarting bool `json:"Restarting"` // TODO
|
Restarting bool `json:"Restarting"` // TODO
|
||||||
OOMKilled bool `json:"OOMKilled"`
|
OOMKilled bool `json:"OOMKilled"`
|
||||||
Dead bool `json:"Dead"`
|
Dead bool `json:"Dead"`
|
||||||
Pid int `json:"Pid"`
|
Pid int `json:"Pid"`
|
||||||
ConmonPid int `json:"ConmonPid,omitempty"`
|
ConmonPid int `json:"ConmonPid,omitempty"`
|
||||||
ExitCode int32 `json:"ExitCode"`
|
ExitCode int32 `json:"ExitCode"`
|
||||||
Error string `json:"Error"` // TODO
|
Error string `json:"Error"` // TODO
|
||||||
StartedAt time.Time `json:"StartedAt"`
|
StartedAt time.Time `json:"StartedAt"`
|
||||||
FinishedAt time.Time `json:"FinishedAt"`
|
FinishedAt time.Time `json:"FinishedAt"`
|
||||||
Health HealthCheckResults `json:"Health,omitempty"`
|
Health HealthCheckResults `json:"Health,omitempty"`
|
||||||
Checkpointed bool `json:"Checkpointed,omitempty"`
|
Checkpointed bool `json:"Checkpointed,omitempty"`
|
||||||
CgroupPath string `json:"CgroupPath,omitempty"`
|
CgroupPath string `json:"CgroupPath,omitempty"`
|
||||||
|
CheckpointedAt time.Time `json:"CheckpointedAt,omitempty"`
|
||||||
|
RestoredAt time.Time `json:"RestoredAt,omitempty"`
|
||||||
|
CheckpointLog string `json:"CheckpointLog,omitempty"`
|
||||||
|
CheckpointPath string `json:"CheckpointPath,omitempty"`
|
||||||
|
RestoreLog string `json:"RestoreLog,omitempty"`
|
||||||
|
Restored bool `json:"Restored,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// Healthcheck returns the HealthCheckResults. This is used for old podman compat
|
// Healthcheck returns the HealthCheckResults. This is used for old podman compat
|
||||||
|
Reference in New Issue
Block a user