containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #19704 from rhatdan/timeout 

Set StopTimeout for compat API if not set by client
This commit is contained in:
OpenShift Merge Robot 2023-08-25 05:28:26 -04:00 committed by GitHub
parent c2bb278a11 f32e954b8a
commit 584c1e70d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/api/handlers/compat/containers_create.go
View File

@ -435,6 +435,7 @@ func cliOpts(cc handlers.CreateContainerConfig, rtc *config.Config) (*entities.C
Rm: cc.HostConfig.AutoRemove, Rm: cc.HostConfig.AutoRemove,
SecurityOpt: cc.HostConfig.SecurityOpt, SecurityOpt: cc.HostConfig.SecurityOpt,
StopSignal: cc.Config.StopSignal, StopSignal: cc.Config.StopSignal,
StopTimeout: rtc.Engine.StopTimeout, // podman default
StorageOpts: stringMaptoArray(cc.HostConfig.StorageOpt), StorageOpts: stringMaptoArray(cc.HostConfig.StorageOpt),
Sysctl: stringMaptoArray(cc.HostConfig.Sysctls), Sysctl: stringMaptoArray(cc.HostConfig.Sysctls),
Systemd: "true", // podman default Systemd: "true", // podman default

7
pkg/domain/infra/abi/play.go
View File

@ -65,6 +65,10 @@ func (ic *ContainerEngine) createServiceContainer(ctx context.Context, name stri
return nil, fmt.Errorf("image for service container: %w", err) return nil, fmt.Errorf("image for service container: %w", err)
} }
rtc, err := ic.Libpod.GetConfigNoCopy()
if err != nil {
return nil, err
}
ctrOpts := entities.ContainerCreateOptions{ ctrOpts := entities.ContainerCreateOptions{
// Inherited from infra containers // Inherited from infra containers
ImageVolume: define.TypeBind, ImageVolume: define.TypeBind,
@ -73,7 +77,8 @@ func (ic *ContainerEngine) createServiceContainer(ctx context.Context, name stri
ReadOnly: true, ReadOnly: true,
ReadWriteTmpFS: false, ReadWriteTmpFS: false,
// No need to spin up slirp etc. // No need to spin up slirp etc.
Net: &entities.NetOptions{Network: specgen.Namespace{NSMode: specgen.NoNetwork}}, Net: &entities.NetOptions{Network: specgen.Namespace{NSMode: specgen.NoNetwork}},
StopTimeout: rtc.Engine.StopTimeout,
} }
// Create and fill out the runtime spec. // Create and fill out the runtime spec.

1
test/apiv2/20-containers.at
View File

@ -308,6 +308,7 @@ cid_top=$(jq -r '.Id' <<<"$output")
t GET containers/${cid_top}/json 200 \ t GET containers/${cid_top}/json 200 \
.Config.Entrypoint[0]="top" \ .Config.Entrypoint[0]="top" \
.Config.Cmd='[]' \ .Config.Cmd='[]' \
.Config.StopTimeout="10" \
.Path="top" \ .Path="top" \
.NetworkSettings.Networks.podman.NetworkID=podman .NetworkSettings.Networks.podman.NetworkID=podman
t POST containers/${cid_top}/start 204 t POST containers/${cid_top}/start 204

3
test/system/700-play.bats
View File

@ -206,6 +206,9 @@ EOF
run_podman container inspect $service_container --format "{{.State.Running}}" run_podman container inspect $service_container --format "{{.State.Running}}"
is "$output" "true" is "$output" "true"
run_podman container inspect $service_container --format '{{.Config.StopTimeout}}'
is "$output" "10" "StopTimeout should be initialized to 10"
# Stop the *main* container and make sure that # Stop the *main* container and make sure that
# 1) The pod transitions to Exited # 1) The pod transitions to Exited
# 2) The service container is stopped # 2) The service container is stopped