Merge autopkgtest-cloud:no-nohz into autopkgtest-cloud:master

Proposed by Brian Murray
Status: Merged
Merged at revision: 440375b8dd2757eb18f4f892541e0e54af52e978
Proposed branch: autopkgtest-cloud:no-nohz
Merge into: autopkgtest-cloud:master
Diff against target: 17 lines (+0/-6)
1 file modified
charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker-config-production/setup-canonical.sh (+0/-6)
Reviewer Review Type Date Requested Status
Paride Legovini (community) Approve
Review via email: mp+429992@code.launchpad.net

Commit message

When adding the virtio_rng workaround I noticed an arm64 nohz workaround which isn't doing anything anymore and the original bug it was working around (LP: #1531768) is now closed.

Proof its not taking effect:

ubuntu@bdmurray-test-1531768:~$ uname -m
aarch64
ubuntu@bdmurray-test-1531768:~$ cat /proc/cmdline
BOOT_IMAGE=/boot/vmlinuz-5.19.0-15-generic root=UUID=cfe829f2-2ab5-42d9-8de4-87138700704d ro console=tty1 console=ttyS0
ubuntu@bdmurray-test-1531768:~$ grep CMDLINE /etc/default/grub
GRUB_CMDLINE_LINUX_DEFAULT="nohz=off"
GRUB_CMDLINE_LINUX=""
ubuntu@bdmurray-test-1531768:~$ grep "console=tty" /boot/grub/grub.cfg
        linux /boot/vmlinuz-5.19.0-15-generic root=UUID=cfe829f2-2ab5-42d9-8de4-87138700704d ro console=tty1 console=ttyS0
                linux /boot/vmlinuz-5.19.0-15-generic root=UUID=cfe829f2-2ab5-42d9-8de4-87138700704d ro console=tty1 console=ttyS0

To post a comment you must log in.
Revision history for this message
Paride Legovini (paride) wrote :

LGTM, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker-config-production/setup-canonical.sh b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker-config-production/setup-canonical.sh
2index b53dfac..d23f658 100644
3--- a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker-config-production/setup-canonical.sh
4+++ b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker-config-production/setup-canonical.sh
5@@ -19,12 +19,6 @@ EOF
6 . /etc/rc.local
7 fi
8
9-# work around arm64 lockups (LP: #1531768)
10-if [ "$(uname -m)" = aarch64 ] && ! grep -q 'GRUB_CMDLINE_LINUX.*nohz-off' /etc/default/grub; then
11- sed -i '/GRUB_CMDLINE_LINUX_DEFAULT/ s/=".*$/="nohz=off"/' /etc/default/grub
12- update-grub
13-fi
14-
15 # work around hung tasks timeout w/ virtio_rng (LP: #1989258)
16 if grep -q kinetic /etc/lsb-release; then
17 if [ "$(uname -m)" = x86_64 ] && ! grep -q 'GRUB_CMDLINE_LINUX=.*module_blacklist=virtio_rng' /etc/default/grub; then

Subscribers

People subscribed via source and target branches