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

Merge pull request #15766 from vrothberg/fix-15284 

generate systemd: warn on --restart without --new
This commit is contained in:
OpenShift Merge Robot 2022-09-13 13:00:23 +02:00 committed by GitHub
parent eb69259305 0ea5080c91
commit c0dd0d696e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/source/markdown/podman-generate-systemd.1.md
View File

@ -85,7 +85,9 @@ Set the systemd unit requires (`Requires=`) option. Similar to wants, but declar
#### **--restart-policy**=*policy* #### **--restart-policy**=*policy*
Set the systemd restart policy. The restart-policy must be one of: "no", "on-success", "on-failure", "on-abnormal", Set the systemd restart policy. The restart-policy must be one of: "no", "on-success", "on-failure", "on-abnormal",
"on-watchdog", "on-abort", or "always". The default policy is *on-failure*. "on-watchdog", "on-abort", or "always". The default policy is *on-failure* unless the container was created with a custom restart policy.
Note that generating a unit without `--new` on a container with a custom restart policy can lead to issues on shutdown; systemd will attempt to stop the unit while Podman tries to restart it. It is recommended to to create the container without `--restart` and use the `--restart-policy` option instead when generating the unit file.
#### **--restart-sec**=*time* #### **--restart-sec**=*time*

12
pkg/systemd/generate/containers.go
View File

@ -148,6 +148,18 @@ func generateContainerInfo(ctr *libpod.Container, options entities.GenerateSyste
return nil, errors.New("conmon PID file path is empty, try to recreate the container with --conmon-pidfile flag") return nil, errors.New("conmon PID file path is empty, try to recreate the container with --conmon-pidfile flag")
} }
// #15284: old units generated without --new can lead to issues on
// shutdown when the containers are created with a custom restart
// policy.
if !options.New {
switch config.RestartPolicy {
case libpodDefine.RestartPolicyNo, libpodDefine.RestartPolicyNone:
// All good
default:
logrus.Warnf("Container %s has restart policy %q which can lead to issues on shutdown: consider recreating the container without a restart policy and use systemd's restart mechanism instead", ctr.ID(), config.RestartPolicy)
}
}
createCommand := []string{} createCommand := []string{}
if config.CreateCommand != nil { if config.CreateCommand != nil {
createCommand = config.CreateCommand createCommand = config.CreateCommand

7
test/system/250-systemd.bats
View File

@ -81,6 +81,13 @@ function service_cleanup() {
skip "FIXME: 2022-09-01: requires conmon-2.1.4, ubuntu has 2.1.3" skip "FIXME: 2022-09-01: requires conmon-2.1.4, ubuntu has 2.1.3"
fi fi
# Warn when a custom restart policy is used without --new (see #15284)
run_podman create --restart=always $IMAGE
cid="$output"
run_podman generate systemd $cid
is "$output" ".*Container $cid has restart policy .*always.* which can lead to issues on shutdown.*" "generate systemd emits warning"
run_podman rm -f $cid
cname=$(random_string) cname=$(random_string)
# See #7407 for --pull=always. # See #7407 for --pull=always.
run_podman create --pull=always --name $cname --label "io.containers.autoupdate=registry" $IMAGE \ run_podman create --pull=always --name $cname --label "io.containers.autoupdate=registry" $IMAGE \