Skip to content

sys-apps/systemd: add systemd patch from v252.12#1058

Merged
tormath1 merged 1 commit intomainfrom
tormath1/systemd
Aug 11, 2023
Merged

sys-apps/systemd: add systemd patch from v252.12#1058
tormath1 merged 1 commit intomainfrom
tormath1/systemd

Conversation

@tormath1
Copy link
Copy Markdown
Contributor

@tormath1 tormath1 commented Aug 10, 2023

It fixes an issue with Systemd service restart when the main process is being killed by a SIGHUP signal.

Closes: flatcar/Flatcar#1157
Commit-Ref: systemd/systemd-stable@34e834f

Testing done

  • locally tested that the patch applies sudo ebuild systemd-252.11-r1.ebuild prepare
  • docker: extend restart test case mantle#447
  • Changelog entries added in the respective changelog/ directory (user-facing change, bug fix, security fix, update)
  • Inspected CI output for image differences: /boot and /usr size, packages, list files for any missing binaries, kernel modules, config files, kernel modules, etc.
$ sudo ./bin/kola run --qemu-image /home/mathieu/flatcar/stable/flatcar_production_qemu_image.img docker.containerd-restart
=== RUN   docker.containerd-restart
--- FAIL: docker.containerd-restart (70.78s)
        cluster.go:117: Unable to find image 'ghcr.io/flatcar/busybox:latest' locally
        cluster.go:117: latest: Pulling from flatcar/busybox
        cluster.go:117: 3f4d90098f5b: Pulling fs layer
        cluster.go:117: 3f4d90098f5b: Verifying Checksum
        cluster.go:117: 3f4d90098f5b: Download complete
        cluster.go:117: 3f4d90098f5b: Pull complete
        cluster.go:117: Digest: sha256:a20bc8249a9e522a11102c61230350537cfa0bc1fef41d382eb660a3bc0b853a
        cluster.go:117: Status: Downloaded newer image for ghcr.io/flatcar/busybox:latest
        docker.go:545: Containerd is not running (could not find pid) after signal: SIGHUP
FAIL, output in _kola_temp/qemu-2023-08-10-1932-113273
harness: test suite failed
$ sudo ./bin/kola run --qemu-image ./flatcar/pr1058/flatcar_production_qemu_uefi_image.img docker.containerd-restart
=== RUN   docker.containerd-restart
--- PASS: docker.containerd-restart (98.99s)
        cluster.go:117: Unable to find image 'ghcr.io/flatcar/busybox:latest' locally
        cluster.go:117: latest: Pulling from flatcar/busybox
        cluster.go:117: 3f4d90098f5b: Pulling fs layer
        cluster.go:117: 3f4d90098f5b: Verifying Checksum
        cluster.go:117: 3f4d90098f5b: Download complete
        cluster.go:117: 3f4d90098f5b: Pull complete
        cluster.go:117: Digest: sha256:a20bc8249a9e522a11102c61230350537cfa0bc1fef41d382eb660a3bc0b853a
        cluster.go:117: Status: Downloaded newer image for ghcr.io/flatcar/busybox:latest
PASS, output in _kola_temp/qemu-2023-08-10-1933-113682

If fixes an issue with Systemd service restart when the main process is
being killed by a SIGHUP signal.

See also: flatcar/Flatcar#1157

Commit-Ref: systemd/systemd-stable@34e834f

Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
@tormath1 tormath1 self-assigned this Aug 10, 2023
@tormath1 tormath1 temporarily deployed to development August 10, 2023 12:38 — with GitHub Actions Inactive
@github-actions
Copy link
Copy Markdown

github-actions bot commented Aug 10, 2023

Build action triggered: https://github.com/flatcar/scripts/actions/runs/5832504748

@tormath1 tormath1 marked this pull request as ready for review August 10, 2023 17:38
@tormath1 tormath1 requested a review from a team August 10, 2023 17:38
Copy link
Copy Markdown
Member

@jepio jepio left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM - but I agree with deferring to @dongsupark or @krnowak for their opinion on cherry-pick vs. update systmed to v252.13 (in some channels).

Copy link
Copy Markdown
Member

@krnowak krnowak left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm fine with adding a patch - it fixes the issue and does not bring potential regressions that a systemd update could have. We can still update systemd in a separate PR.

@tormath1 tormath1 merged commit 4f7c4a5 into main Aug 11, 2023
@tormath1 tormath1 deleted the tormath1/systemd branch August 11, 2023 12:20
@tormath1
Copy link
Copy Markdown
Contributor Author

cherry-picked to:

  • flatcar-3510
  • flatcar-3602
  • flatcar-3689

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Containerd not restarting properly after upgrade to systemd 252.11 on stable

3 participants