Fix swap page size during el8toel9 upgrade on aarch64 #937

matejmatuska · 2022-08-09T11:56:34Z

The kernel in RHEL8 uses 64k page size, but this is changed in RHEL9 to
4k. This breaks SWAP and it must be reinitialized.

The reinitialization is done in initramfs before first boot into the new
system as on some systems SWAP is essential to boot successfully.

The swapon command used for reinitialization internally uses
mkswap and both of these commands are unavailable in the dracut shell.
As a workaround we can use $NEWROOT/usr/sbin/swapon and
$NEWROOT/usr/sbin/mkswap. For swapon to find mkswap the PATH must be
temporarily adjusted.

Jira ref: OAMG-6382

github-actions · 2022-08-09T11:56:46Z

Thank you for contributing to the Leapp project!

Please note that every PR needs to comply with the Leapp Guidelines and must pass all tests in order to be mergable.
If you want to request a review or rebuild a package in copr, you can use following commands as a comment:

review please to notify leapp developers of review request
/packit copr-build to submit a public copr build using packit

To launch regression testing public members of oamg organization can leave the following comment:

/rerun to schedule basic regression tests using this pr build and leapp*master* as artifacts
/rerun 42 to schedule basic regression tests using this pr build and leapp*PR42* as artifacts
/rerun-all to schedule all tests (including sst) using this pr build and leapp*master* as artifacts
/rerun-all 42 to schedule all tests (including sst) using this pr build and leapp*PR42* as artifacts

Please open ticket in case you experience technical problem with the CI. (RH internal only)

Note: In case there are problems with tests not being triggered automatically on new PR/commit or pending for a long time, please consider rerunning the CI by commenting leapp-ci build (might require several comments). If the problem persists, contact leapp-infra.

...grade/common/actors/commonleappdracutmodules/files/dracut/85sys-upgrade-redhat/do-upgrade.sh

leapp-bot · 2022-08-10T09:00:11Z

This PR has been linked in issue tracker (#OAMG-7402).

The kernel in RHEL8 uses 64k page size, but this is changed in RHEL9 to 4k. This breaks SWAP and it must be reinitialized. The reinitialization is done in initramfs before first boot into the new system as on some systems SWAP is essential to boot successfully. The `swapon` command used for reinitialization internally uses `mkswap` and both of these commands are unavailable in the dracut shell. As a workaround we can use `$NEWROOT/usr/sbin/swapon` and `$NEWROOT/usr/sbin/mkswap`. For `swapon` to find `mkswap` the `PATH` must be temporarily adjusted. Co-authored-by: Petr Stodůlka <xstodu05@gmail.com>

fernflower · 2022-08-11T11:42:02Z

/rerun

github-actions · 2022-08-11T11:46:45Z

Copr build succeeded: https://copr.fedorainfracloud.org/coprs/build/4725123

github-actions · 2022-08-11T11:55:22Z

Testing Farm request for RHEL-8.6-rhui/4725123 regression testing has been created.
Once finished, results should be available here.
Full pipeline log.

github-actions · 2022-08-11T12:14:15Z

Testing Farm request for RHEL-7.9-rhui/4725123 regression testing has been created.
Once finished, results should be available here.
Full pipeline log.

github-actions · 2022-08-11T13:03:44Z

Testing Farm request for RHEL-8.6.0-Nightly/4725123 regression testing has been created.
Once finished, results should be available here.
Full pipeline log.

github-actions · 2022-08-11T14:26:44Z

Testing Farm request for RHEL-7.9-ZStream/4725123 regression testing has been created.
Once finished, results should be available here.
Full pipeline log.

Rezney

Thanks for your patch. Works fine. There is an issue when users use file-based swap as when we copy the fstab into the initramdisk, the path to the file is already different. E.g /spawfile vs. $SYSROOT/swapfile. Anyway, we may deal with that later.

matejmatuska · 2022-08-18T07:51:11Z

...grade/common/actors/commonleappdracutmodules/files/dracut/85sys-upgrade-redhat/do-upgrade.sh

+            # NOTE: we want to continue the upgrade even when the swapon command fails as users can fix it
+            # manually later. It's not a major blocker.
+            PATH="$PATH:${NEWROOT}/usr/sbin/" swapon -af || echo >&2 "Error: Failed fixing the swap page size. Manual action is required after the upgrade."
+            mv /etc/fstab.leapp_bp /etc/leapp


I just noticed a bug, the destination should be /etc/fstab not /etc/leapp.
The whole command should look like this: mv /etc/fstab.leapp_bp /etc/fstab

## Packaging - Provide and require leapp-repository-dependencies 7 (oamg#952) - Provide `leapp-command(<CMD>)` for each CLI command provided by leapp-repository (oamg#947) - Require dracut, kmod, procps-ng on RHEL 8+ (oamg#952) - Require leapp-framework >= 3.1 (oamg#905, oamg#927) ## Upgrade handling ### Fixes - Do not create the upgrade bootloader entry when the dnf dry-run actor fails (oamg#912) - Do not inhibit in-place upgrades in case LUKS volumes are Ceph OSDs (oamg#735) - Fix & improve application of custom selinux rules to be less error prone and do not override changes done by RPM scriptlets (oamg#925) - Fix detection of deprecated devices (and drivers) regarding the PCI address (oamg#881) - Fix detection of deprecated kernel modules (oamg#874) - Fix the false positive NFS storage detection on NFS servers (oamg#888) - Fix the issues on systems with the LANGUAGE environment variable (oamg#887) - Fix the root directory scan to deal with non-utf8 filenames (oamg#927) - Skip comment lines when parsing the GRUB configuration file (oamg#883) - Stop propagating the “debug” and ”enforcing=0” kernel cmdline options into the target kernel cmdline options (oamg#938, oamg#950) - [IPU 7 -> 8] Fix the upgrade of the Satellite server (oamg#875, oamg#878, oamg#879 oamg#890, oamg#899, oamg#916, 934) - [IPU 7 -> 8] Fix SSSD: Prune old cache files (the format of data is incompatible) (oamg#922) - [IPU 8 -> 9] Enable the CRB repository for the upgrade only if enabled on the source system (oamg#942) - [IPU 8 -> 9] Drop obsoleted actor blocking upgrade on z16 (oamg#892) - [IPU 8 -> 9] Fix cloud provider detection on AWS (oamg#920) - [IPU 8 -> 9] Fix detention of the latest kernel on RHEL 8+ systems (oamg#909) - [IPU 8 -> 9] Fix issues caused by leapp artifacts from previous in-place upgrades (oamg#889) - [IPU 8 -> 9] Fix issues with false positive switch to emergency console during the upgrade (oamg#906) - [IPU 8 -> 9] Fix swap page size on aarch64 (oamg#937, oamg#948) - [IPU 8 -> 9] Fix the VDO scanner to skip partitions unrelated to VDO and adjust error messages (oamg#919) ### Enhancements - Add 8.7 & 9.1 Beta & GA product certificates (oamg#891) - Detect /var/lib/leapp being mounted in a non-persistent fashion (oamg#921) - Detect /var/lib/leapp mounted with the noexec option (oamg#908) - Improve the report msg when NFS partitions are discovered providing info about concrete mountpoints (oamg#806) - Inform about necessary migrations related to bacula-director (oamg#896) - [IPU 7 -> 8] The default upgrade path for RHEL SAP is 7.9 -> 8.6 (oamg#939) - [IPU 7 -> 8] Detect and fix missing newline at the end of /etc/default/grub (oamg#945) - [IPU 7 -> 8] Handle upgrades of SAP Apps systems on Azure (oamg#926) - [IPU 7 -> 8] Handle upgrades on RHUI Google Cloud (oamg#897, oamg#946) - [IPU 8 -> 9] Support upgrade path RHEL 8.7 -> 9.0 and RHEL SAP 8.6 -> 9.0 (oamg#903, oamg#894) - [IPU 8 -> 9] Add actors covering removal of NIS components on RHEL 9 (oamg#851) - [IPU 8 -> 9] Add checks for obsolete .NET versions (oamg#867) - [IPU 8 -> 9] Allow specifying the report schema v1.2.0 (oamg#872) - [IPU 8 -> 9] Check and handle upgrades with custom crypto policies (oamg#898) - [IPU 8 -> 9] Check and migrate OpenSSH configuration (oamg#864, oamg#860) - [IPU 8 -> 9] Check and migrate multipath configuration the upgrade (oamg#886) - [IPU 8 -> 9] Check minimum memory requirements (oamg#935) - [IPU 8 -> 9] Enable Base and SAP In-place upgrades on Azure (oamg#943) - [IPU 8 -> 9] Enable in-place upgrades in Azure RHEL 8 base images using RHUI (oamg#918) - [IPU 8 -> 9] Handle upgrades of SAP systems on AWS (oamg#924) - [IPU 8 -> 9] Inhibit upgrade when NVIDIA driver is detected (oamg#880) - [IPU 8 -> 9] Migrate blocklisted CAs (oamg#882) - [IPU 8 -> 9] Migrate the OpenSSL configuration (oamg#900) - [IPU 8 -> 9] Report changes around SCP and SFTP (oamg#863, oamg#893) ## Additional changes interesting for devels - Extend LsblkEntry model in StorageInfo by kernel name and size of partition in bytes (oamg#919) - Mass refactoring: Fix imports in actors and libraries to follow project guidelines (oamg#932) - Mass refactoring: Replace use of deprecated `reporting.(Tags|Flags)` by `reporting.Groups` (oamg#932) - PESEventScanner actor has been fully refactored (oamg#856, oamg#941) - Use library function is_inhibitor to check for failures (oamg#905) Signed-off-by: Petr Stodulka <pstodulk@redhat.com>

## Packaging - Provide and require leapp-repository-dependencies 7 (#952) - Provide `leapp-command(<CMD>)` for each CLI command provided by leapp-repository (#947) - Require dracut, kmod, procps-ng on RHEL 8+ (#952) - Require leapp-framework >= 3.1 (#905, #927) ## Upgrade handling ### Fixes - Do not create the upgrade bootloader entry when the dnf dry-run actor fails (#912) - Do not inhibit in-place upgrades in case LUKS volumes are Ceph OSDs (#735) - Fix & improve application of custom selinux rules to be less error prone and do not override changes done by RPM scriptlets (#925) - Fix detection of deprecated devices (and drivers) regarding the PCI address (#881) - Fix detection of deprecated kernel modules (#874) - Fix the false positive NFS storage detection on NFS servers (#888) - Fix the issues on systems with the LANGUAGE environment variable (#887) - Fix the root directory scan to deal with non-utf8 filenames (#927) - Skip comment lines when parsing the GRUB configuration file (#883) - Stop propagating the “debug” and ”enforcing=0” kernel cmdline options into the target kernel cmdline options (#938, #950) - [IPU 7 -> 8] Fix the upgrade of the Satellite server (#875, #878, #879 #890, #899, #916, 934) - [IPU 7 -> 8] Fix SSSD: Prune old cache files (the format of data is incompatible) (#922) - [IPU 8 -> 9] Enable the CRB repository for the upgrade only if enabled on the source system (#942) - [IPU 8 -> 9] Drop obsoleted actor blocking upgrade on z16 (#892) - [IPU 8 -> 9] Fix cloud provider detection on AWS (#920) - [IPU 8 -> 9] Fix detention of the latest kernel on RHEL 8+ systems (#909) - [IPU 8 -> 9] Fix issues caused by leapp artifacts from previous in-place upgrades (#889) - [IPU 8 -> 9] Fix issues with false positive switch to emergency console during the upgrade (#906) - [IPU 8 -> 9] Fix swap page size on aarch64 (#937, #948) - [IPU 8 -> 9] Fix the VDO scanner to skip partitions unrelated to VDO and adjust error messages (#919) ### Enhancements - Add 8.7 & 9.1 Beta & GA product certificates (#891) - Detect /var/lib/leapp being mounted in a non-persistent fashion (#921) - Detect /var/lib/leapp mounted with the noexec option (#908) - Improve the report msg when NFS partitions are discovered providing info about concrete mountpoints (#806) - Inform about necessary migrations related to bacula-director (#896) - [IPU 7 -> 8] The default upgrade path for RHEL SAP is 7.9 -> 8.6 (#939) - [IPU 7 -> 8] Detect and fix missing newline at the end of /etc/default/grub (#945) - [IPU 7 -> 8] Handle upgrades of SAP Apps systems on Azure (#926) - [IPU 7 -> 8] Handle upgrades on RHUI Google Cloud (#897, #946) - [IPU 8 -> 9] Support upgrade path RHEL 8.7 -> 9.0 and RHEL SAP 8.6 -> 9.0 (#903, #894) - [IPU 8 -> 9] Add actors covering removal of NIS components on RHEL 9 (#851) - [IPU 8 -> 9] Add checks for obsolete .NET versions (#867) - [IPU 8 -> 9] Allow specifying the report schema v1.2.0 (#872) - [IPU 8 -> 9] Check and handle upgrades with custom crypto policies (#898) - [IPU 8 -> 9] Check and migrate OpenSSH configuration (#864, #860) - [IPU 8 -> 9] Check and migrate multipath configuration the upgrade (#886) - [IPU 8 -> 9] Check minimum memory requirements (#935) - [IPU 8 -> 9] Enable Base and SAP In-place upgrades on Azure (#943) - [IPU 8 -> 9] Enable in-place upgrades in Azure RHEL 8 base images using RHUI (#918) - [IPU 8 -> 9] Handle upgrades of SAP systems on AWS (#924) - [IPU 8 -> 9] Inhibit upgrade when NVIDIA driver is detected (#880) - [IPU 8 -> 9] Migrate blocklisted CAs (#882) - [IPU 8 -> 9] Migrate the OpenSSL configuration (#900) - [IPU 8 -> 9] Report changes around SCP and SFTP (#863, #893) ## Additional changes interesting for devels - Extend LsblkEntry model in StorageInfo by kernel name and size of partition in bytes (#919) - Mass refactoring: Fix imports in actors and libraries to follow project guidelines (#932) - Mass refactoring: Replace use of deprecated `reporting.(Tags|Flags)` by `reporting.Groups` (#932) - PESEventScanner actor has been fully refactored (#856, #941) - Use library function is_inhibitor to check for failures (#905) Signed-off-by: Petr Stodulka <pstodulk@redhat.com>

pirat89 reviewed Aug 9, 2022

View reviewed changes

...grade/common/actors/commonleappdracutmodules/files/dracut/85sys-upgrade-redhat/do-upgrade.sh Outdated Show resolved Hide resolved

matejmatuska force-pushed the aarch64-swap-fix branch from 9faaef1 to f9b5ba4 Compare August 10, 2022 10:53

pirat89 added this to the 7.9/8.7 milestone Aug 11, 2022

pirat89 added the bug Something isn't working label Aug 11, 2022

pirat89 assigned Rezney Aug 17, 2022

Rezney approved these changes Aug 18, 2022

View reviewed changes

Rezney merged commit f01a739 into oamg:master Aug 18, 2022

matejmatuska commented Aug 18, 2022

View reviewed changes

MichalHe added the changelog-checked The merger/reviewer checked the changelog draft document and updated it when relevant label Aug 18, 2022

matejmatuska mentioned this pull request Aug 18, 2022

PR#937 Follow up bugfix #948

Merged

matejmatuska deleted the aarch64-swap-fix branch August 23, 2022 09:06

pirat89 mentioned this pull request Aug 23, 2022

# Release 0.17.0 #953

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix swap page size during el8toel9 upgrade on aarch64 #937

Fix swap page size during el8toel9 upgrade on aarch64 #937

matejmatuska commented Aug 9, 2022

github-actions bot commented Aug 9, 2022

leapp-bot commented Aug 10, 2022

fernflower commented Aug 11, 2022

github-actions bot commented Aug 11, 2022

github-actions bot commented Aug 11, 2022

github-actions bot commented Aug 11, 2022

github-actions bot commented Aug 11, 2022

github-actions bot commented Aug 11, 2022

Rezney left a comment

matejmatuska Aug 18, 2022

Fix swap page size during el8toel9 upgrade on aarch64 #937

Fix swap page size during el8toel9 upgrade on aarch64 #937

Conversation

matejmatuska commented Aug 9, 2022

github-actions bot commented Aug 9, 2022

Thank you for contributing to the Leapp project!

leapp-bot commented Aug 10, 2022

fernflower commented Aug 11, 2022

github-actions bot commented Aug 11, 2022

github-actions bot commented Aug 11, 2022

github-actions bot commented Aug 11, 2022

github-actions bot commented Aug 11, 2022

github-actions bot commented Aug 11, 2022

Rezney left a comment

Choose a reason for hiding this comment

matejmatuska Aug 18, 2022

Choose a reason for hiding this comment