Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to systemd v247 and dbus-broker 26 #1265

Merged
merged 2 commits into from
Jan 28, 2021
Merged

Update to systemd v247 and dbus-broker 26 #1265

merged 2 commits into from
Jan 28, 2021

Conversation

etungsten
Copy link
Contributor

@etungsten etungsten commented Jan 7, 2021 •
edited
Loading

Issue number:
N/A

Description of changes:

systemd-oomd is a new thing that's in preview phase. I decided to exclude it for now as it was throwing errors in the system journal:

Jan 07 07:27:29 systemd[1]: systemd-oomd.service: Scheduled restart job, restart counter is at 2.
Jan 07 07:27:29 systemd[1]: Stopped Userspace Out-Of-Memory (OOM) Killer.
Jan 07 07:27:29 systemd[1]: Starting Userspace Out-Of-Memory (OOM) Killer...
Jan 07 07:27:29 systemd-oomd[359]: Requires swap to operate
Jan 07 07:27:29 systemd[1]: systemd-oomd.service: Main process exited, code=exited, status=1/FAILURE
Jan 07 07:27:29 systemd[1]: systemd-oomd.service: Failed with result 'exit-code'.
Jan 07 07:27:29 systemd[1]: Failed to start Userspace Out-Of-Memory (OOM) Killer.
Jan 07 07:27:29 storewolf[357]: 07:27:29 [INFO] Datastore populated
Jan 07 07:27:29 systemd[1]: Finished Datastore creator.
Jan 07 07:27:29 systemd[1]: systemd-oomd.service: Scheduled restart job, restart counter is at 3.
Jan 07 07:27:29 systemd[1]: Starting Bottlerocket API server...
Jan 07 07:27:29 systemd[1]: Stopped Userspace Out-Of-Memory (OOM) Killer.
Jan 07 07:27:29 systemd[1]: Starting Userspace Out-Of-Memory (OOM) Killer...
Jan 07 07:27:29 kernel: random: crng init done
Jan 07 07:27:29 kernel: random: 7 urandom warning(s) missed due to ratelimiting
Jan 07 07:27:29 systemd[1]: Finished Load/Save Random Seed.
Jan 07 07:27:29 systemd[1]: Reached target First Boot Complete.
Jan 07 07:27:29 systemd[1]: Starting Commit a transient machine-id on disk...
Jan 07 07:27:29 systemd-oomd[363]: Requires swap to operate
Jan 07 07:27:29 systemd[1]: systemd-oomd.service: Main process exited, code=exited, status=1/FAILURE
Jan 07 07:27:29 systemd[1]: systemd-oomd.service: Failed with result 'exit-code'.
Jan 07 07:27:29 systemd[1]: Failed to start Userspace Out-Of-Memory (OOM) Killer.

With regards to the udev event changes, the only udev rule we're maintaining is for ephemeral storage and it's still compatible with systemd v247's changes.

No other systemd changes should impact us.

I updated the 9003 patch for systemd to accommodate new version changes, namely systemd/systemd@53171c0.

I added a new patch to restore prefix=@prefix@ in systemd's pkg-config to allow prefix to be overridable again so that we don't install things under /usr directly.

  • Updates dbus-broker to v25

Testing done:
Launched aws-k8s-1.17 x86_64 and aws-k8s-1.18 aarch64 nodes.
Both nodes are able to run pods OK.
System journal shows no abnormalities.
I also confirmed that I was able to open the system journal produced by v247 with older versions of systemd.

Terms of contribution:

By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.

@etungsten etungsten changed the title Systemd 247 dbus broker 25 Update to systemd v247 and dbus broker 25 Jan 7, 2021
@etungsten etungsten changed the title Update to systemd v247 and dbus broker 25 Update to systemd v247 and dbus-broker 25 Jan 7, 2021
@etungsten etungsten mentioned this pull request Jan 7, 2021
Merged
3 tasks
@etungsten etungsten marked this pull request as draft January 7, 2021 22:19
@etungsten
Copy link
Contributor Author

Moving PR to draft mode as there are some unanswered questions about how the udev rules changes impacts us.

@bcressey
Copy link
Contributor

bcressey commented Jan 8, 2021

Moving PR to draft mode as there are some unanswered questions about how the udev rules changes impacts us.

In ephemeral-storage.rules we're already using the recommended style of header guard:

ACTION=="remove", GOTO="ephemeral_storage_end"

As far as I know the only other udev rules we ship come from the systemd package. I'd expect those have all been updated but it wouldn't hurt to run head /usr/lib/udev/rules.d/*.rules and look at the first ACTION line.

@etungsten
Copy link
Contributor Author

etungsten commented Jan 8, 2021 •
edited
Loading

Push above rebases onto develop to pull in latest package updates and aws-k8s-1.19 variant

@etungsten
Copy link
Contributor Author

Push above addresses #1265 (comment)

@etungsten
Copy link
Contributor Author

etungsten commented Jan 11, 2021 •
edited
Loading

I'd expect those have all been updated but it wouldn't hurt to run head /usr/lib/udev/rules.d/*.rules and look at the first ACTION line.

Here is a gist of head /usr/lib/udev/rules.d/*.rules: https://gist.github.com/etungsten/270558834de44668bd8e5d8adf881304
They look fine to me.

The only one we maintain ourselves is ephemeral-storage.rules which is following the new guidance for compatibility.

@etungsten
Copy link
Contributor Author

etungsten commented Jan 25, 2021 •
edited
Loading

Push above rebases onto develop

@etungsten etungsten marked this pull request as ready for review January 25, 2021 21:26
@etungsten
systemd: update to 247
e087346 
Update 9003 patch to accomodate new version changes.
Add new 9007 and 9008 patch to make prefix configurable again for
packaging
@etungsten
dbus-broker: update to 26
0cf8b84
@etungsten etungsten closed this Jan 27, 2021
@etungsten etungsten deleted the systemd-247-dbus-broker-25 branch January 27, 2021 23:10
@etungsten etungsten restored the systemd-247-dbus-broker-25 branch January 27, 2021 23:11
@etungsten etungsten reopened this Jan 27, 2021
@etungsten
Copy link
Contributor Author

etungsten commented Jan 27, 2021 •
edited
Loading

Please ignore me failing miserably in trying to rename the branch.

Push above addresses both of @tjkirch 's comments:
Updates dbus-broker to 26
Adds a small patch on top of a patch that adds systemd/systemd@60bce7c to restore prefix path configurability.

Tested things and they still work as described in the PR description.

@etungsten etungsten changed the title Update to systemd v247 and dbus-broker 25 Update to systemd v247 and dbus-broker 26 Jan 27, 2021
@tjkirch tjkirch requested a review from bcressey January 28, 2021 00:25
@etungsten etungsten merged commit a02c762 into bottlerocket-os:develop Jan 28, 2021
@etungsten etungsten deleted the systemd-247-dbus-broker-25 branch January 28, 2021 18:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tjkirch tjkirch tjkirch approved these changes

@bcressey bcressey bcressey approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@etungsten @bcressey @tjkirch