diff --git a/libpod/container_inspect.go b/libpod/container_inspect.go index d6f404c701..99e6feaa62 100644 --- a/libpod/container_inspect.go +++ b/libpod/container_inspect.go @@ -166,6 +166,7 @@ func (c *Container) getContainerInspectData(size bool, driverData *define.Driver IsInfra: c.IsInfra(), IsService: c.IsService(), KubeExitCodePropagation: config.KubeExitCodePropagation.String(), + LockNumber: c.lock.ID(), } if config.RootfsImageID != "" { // May not be set if the container was created with --rootfs diff --git a/libpod/define/container_inspect.go b/libpod/define/container_inspect.go index 0309a8dde0..457de626c9 100644 --- a/libpod/define/container_inspect.go +++ b/libpod/define/container_inspect.go @@ -691,6 +691,7 @@ type InspectContainerData struct { IsInfra bool `json:"IsInfra"` IsService bool `json:"IsService"` KubeExitCodePropagation string `json:"KubeExitCodePropagation"` + LockNumber uint32 `json:"lockNumber"` Config *InspectContainerConfig `json:"Config"` HostConfig *InspectContainerHostConfig `json:"HostConfig"` } diff --git a/libpod/define/pod_inspect.go b/libpod/define/pod_inspect.go index 9607bf868d..bcd34f15a1 100644 --- a/libpod/define/pod_inspect.go +++ b/libpod/define/pod_inspect.go @@ -85,6 +85,8 @@ type InspectPodData struct { BlkioWeightDevice []InspectBlkioWeightDevice `json:"blkio_weight_device,omitempty"` // RestartPolicy of the pod. RestartPolicy string `json:"RestartPolicy,omitempty"` + // Number of the pod's Libpod lock. + LockNumber uint32 } // InspectPodInfraConfig contains the configuration of the pod's infra diff --git a/libpod/define/volume_inspect.go b/libpod/define/volume_inspect.go index 4d6f12080a..c4b45a04f5 100644 --- a/libpod/define/volume_inspect.go +++ b/libpod/define/volume_inspect.go @@ -61,6 +61,8 @@ type InspectVolumeData struct { // StorageID is the ID of the container backing the volume in c/storage. // Only used with Image Volumes. StorageID string `json:"StorageID,omitempty"` + // LockNumber is the number of the volume's Libpod lock. + LockNumber uint32 } type VolumeReload struct { diff --git a/libpod/pod_api.go b/libpod/pod_api.go index f8e70cc8f5..8140b5e17b 100644 --- a/libpod/pod_api.go +++ b/libpod/pod_api.go @@ -742,6 +742,7 @@ func (p *Pod) Inspect() (*define.InspectPodData, error) { BlkioDeviceWriteBps: p.BlkiThrottleWriteBps(), CPUShares: p.CPUShares(), RestartPolicy: p.config.RestartPolicy, + LockNumber: p.lock.ID(), } return &inspectData, nil diff --git a/libpod/volume_inspect.go b/libpod/volume_inspect.go index 31fbd5eff0..e2300da471 100644 --- a/libpod/volume_inspect.go +++ b/libpod/volume_inspect.go @@ -65,6 +65,7 @@ func (v *Volume) Inspect() (*define.InspectVolumeData, error) { data.NeedsCopyUp = v.state.NeedsCopyUp data.NeedsChown = v.state.NeedsChown data.StorageID = v.config.StorageID + data.LockNumber = v.lock.ID() if v.config.Timeout != nil { data.Timeout = *v.config.Timeout