s390x fixes: zfcp+zipl #983

rmetrich · 2022-11-07T08:52:34Z

When having systems configured with ZFCP instead of DASD, the disks
are not seen while rebooting because /etc/zfcp.conf is missing
in the initramfs.

The conversion of ZIPL to BLS on IBM Z machines failed when
a) the machine was configured using ZFCP instead of DASD
b) /boot was not on a separate partition

In case a), the zipl-switch-to-blscfg script failed as the /dev has
not been propagated to into the el8userspace container and also all required nodes has not been visible inside the upgrade initramfs due to missing /etc/zfcp.conf inside the initramfs. Regarding that the script failed the conversion.

With this fix, the /dev is bindmounted into the el8userspace container
using the (systemd-nspawn) --bind option. The direct bind mounting
via leapp.libraries.common.mounting.BindMount cannot be used in this
case as it blocks the correct start of the container.

Also, when the file exists, it's copied inside the userspace container
and installed in the upgrade initramfs, producing
TargetUserSpaceUpgradeTasks, UpgradeInitramfsTasks
messages.

In case b), the content of /boot has been removed during the upgrade
due to problems when using BindMount on normal directory (that is not
mountpoint). This has been possibly resolved by this commit also,
as the /boot has been propagated using the --bind (sysmd-nspawn)
option as well.
NOTE: The case b) has not been tested yet and this PR primarily targets to fix the case a). As the inhibitor for s390x systems with /boot merged in rootfs, even when the case b) is not tested successfuly, it does not prevent the merge of this PR.

See https://bugzilla.redhat.com/show_bug.cgi?id=2140563

github-actions · 2022-11-07T08:52:47Z

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 mergeable.
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.

leapp-bot · 2022-11-07T09:00:23Z

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

pirat89 · 2022-11-07T12:23:43Z

looks good. I will do some updates in unit-tests

When having systems configured with ZFCP instead of DASD, the disks are not seen while rebooting because `/etc/zfcp.conf` is missing in the initramfs. When the file exists, it's copied inside the userspace container and installed in the upgrade initramfs, producing TargetUserSpaceUpgradeTasks, UpgradeInitramfsTasks messages. pstodulk: updated unit-tests in the scanzfcp and scandasd actors Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2140563 Signed-off-by: Renaud Métrich <rmetrich@redhat.com>

…iner (s390x) The conversion of ZIPL to BLS on IBM Z machines failed when a) the machine was configured using ZFCP instead of DASD b) /boot was not on a separate partition In case a), the zipl-switch-to-blscfg script failed as the /dev has not been propagated to into the el8userspace container. Regarding that, the /dev did not contain all required devices needed for the correct conversion. With this fix, the /dev is bindmounted into the el8userspace container using the (systemd-nspawn) `--bind` option. The direct bind mounting via `leapp.libraries.common.mounting.BindMount` cannot be used in this case as it blocks the correct start of the container. In case b), the content of /boot has been removed during the upgrade due to problems when using BindMount on normal directory (that is not mountpoint). This has been possibly resolved by this commit also, as the /boot has been propagated using the --bind (sysmd-nspawn) option as well. (Untested) Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2140563 Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1901440 Signed-off-by: Renaud Métrich <rmetrich@redhat.com>

pirat89 · 2022-11-07T19:20:01Z

@rmetrich seems done. Pls check if you are ok with changes. The commit msgs have been updated too.

@smitterl Will you have a time to create for me the system with merged /boot as mentioned in the case b) of the description of this PR? I can test whether the current fix is really fixing this issue (still manual update of the code is needed).

rmetrich · 2022-11-08T10:02:28Z

@pirat89 LGTM

pirat89 · 2022-11-09T17:01:57Z

/rerun-all

github-actions · 2022-11-09T17:06:34Z

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

github-actions · 2022-11-09T17:07:03Z

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

github-actions · 2022-11-09T17:07:07Z

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

github-actions · 2022-11-09T17:31:26Z

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

github-actions · 2022-11-09T17:37:52Z

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

github-actions · 2022-11-09T18:41:36Z

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

github-actions · 2022-11-09T18:53:31Z

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

github-actions · 2022-11-09T19:35:34Z

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

github-actions · 2022-11-09T20:08:08Z

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

## Packaging - Requires cpio (oamg#979) - Requires python3-gobject-base, NetworkManager-libnm (oamg#969) - Bump leapp-repository-dependencies to 9 (oamg#969, oamg#979) ## Upgrade handling ### Fixes - Add leapp RHUI packages to an allowlist to drop confusing reports (oamg#995) - Check only mounted XFS partitions (oamg#1027) - Detect the kernel-core RPM instead of kernel to prevent an error during post-upgrade phases (oamg#1024) - Disable the amazon-id DNF plugin on AWS during the upgrade stage to omit error messages during the upgrade process caused by missing network connection (oamg#990) - Do not create new *pyc files when running leapp after the DNF upgrade transaction (oamg#1017) - Enable upgrades on s390x when /boot is part of rootfs (oamg#991) - Extend the allow list of RHUI clients by azure-sap-apps to omit confusing report (oamg#974) - Filter out PES events unrelated for the used upgrade path and handle overlapping events (oamg#1008) - Fix scan of ceph volumes on systems without ceph-osd (oamg#1011) - Fix scan of ceph volumes when ceph-osd container is not found (oamg#986) - Fix systemd symlinks that become incorrect during the IPU (oamg#972) - Fix the check of memory (RAM) limits (oamg#984) - Fix the upgrade of IBM Z machines configured with ZFCP (oamg#983) - Ignore external accounts in /etc/passwd (oamg#958) - Inhibit the upgrade when entries in /etc/fstab cause overshadowing during the upgrade (oamg#1009) - Prevent leapp failures caused by re-run of leapp in the upgrade initramfs after previous failure, which causes additional confusing error message hiding original bugs (oamg#996) - Prevent the upgrade with RHSM when a baseos and an appstream target repositories are not discovered (oamg#1001) - RHUI(Azure) handle correctly various SAP images (oamg#1037) - Rework the network configuration handling and parse the configuration data properly (oamg#969) - Set RHSM release for non-ga and non-beta channels (oamg#1033) - Use the "grub" library to find the GRUB device (oamg#989) - [IPU 7 -> 8] Detect corrupted grubenv file (oamg#1012) - [IPU 7 -> 8] Ensure that rsyncd stays enabled if it is enabled prior the upgrade(oamg#1043) - [IPU 7 -> 8] Ensure that satellite metapackages are installed after the upgrade (oamg#994) - [IPU 7 -> 8] Ensure the device_cio_free service stays enabled on s390x after the upgrade (oamg#977) - [IPU 7 -> 8] Fixed checks for RHEL SAP IPU 7.9 -> 8.6 (oamg#978) - [IPU 7 -> 8] Fixed migration of ntp to chrony when the ntp service is masked (oamg#966) - [IPU 7 -> 8] Prevent the traceback during migration of sendmail configuration files when the package is not installed (oamg#1041) - [IPU 7 -> 8] Satellite: reindex all related databases to fix issues due to new locales in RHEL 8 (oamg#1007, oamg#1018) - [IPU 7 -> 8] Use the correct domain name in SSSD reports (oamg#1040) - [IPU 8 -> 9] Added checks for RHEL SAP IPU 8.6 -> 9.0 (oamg#978) - [IPU 8 -> 9] CheckVDO: Ask user for the confirmation only on failures and undetermined devices (oamg#961) - [IPU 8 -> 9] Fix the kernel detection during initramfs creation for new kernel on RHEL 9.2+ (oamg#1048) - [IPU 8 -> 9] Fix the upgrade on Azure using RHUI for SAP Apps images (oamg#975) - [IPU 8 -> 9] Handle correctly firewalld version 0.8 (oamg#963) ### Enhancements - Set new upgrade paths (oamg#988): -- RHEL 7.9 -> 8.8, 8.6 (default: 8.8) -- RHEL 8.6 -> 9.0 -- RHEL 8.8 -> 9.2 - Check that used leapp data are valid and compatible with the installed leapp-repository (oamg#1003) - Detect a proxy configuration in YUM/DNF and adjust an error msg on issues caused by the configuration (oamg#914) - Detect and report systemd symlinks that are broken before the upgrade (oamg#972) - Drop obsoleted upgrade paths (oamg#1047) - Improve remediation instructions for packages in unknown repositories (oamg#1010) - Improve the error message to guide users when discovered more space is needed (oamg#956) - Introduce --nogpgcheck option to skip checking of RPM signatures (oamg#910) - Introduced an option to use an ISO file as a target RHEL version content source (oamg#979) - Introduced possibility to specify what systemd services should be enabled/disabled on the upgraded system (oamg#964) - Map the target repositories also based on the installed content (oamg#967) - Provide common information about systemd services (oamg#959) - Register subscribed systems automatically to Red Hat Insights unless --no-insights-register is used (oamg#1000) - Remove obsoleted GPG keys provided by RH after the upgrade to prevent errors (oamg#1022) - Run upgrade process with checking RPM signatures by default (oamg#910, oamg#993, oamg#1025) - Save breadcrumbs results as RHSM facts (oamg#1002) - Small improvements in various reports (oamg#1038, oamg#1039, oamg#1032) - [IPU 8 -> 9] Detect CIFS also when upgrading from RHEL8 to RHEL9 (PR1035) - [IPU 8 -> 9] Detect RoCE on IBM Z machines and check the configuration is safe for the upgrade (oamg#1030) - [IPU 8 -> 9] Enable upgrades of RHEL 8 for SAP HANA to RHEL 9 on ppc64le (oamg#1042) - [IPU 8 -> 9] Improve the handling of blocklisted certificates (oamg#992) ## Additional changes interesting for devels - Started work on bringing up networking inside the upgrade initramfs - currently available for testing and development purposes when LEAPP_DEVEL_INITRAM_NETWORK is set (oamg#960) - Add leapp debug tools to the upgrade initramfs - dracut upgrade module (oamg#997) - Enable disabling of DNF plugins in the dnfplugin library (oamg#990)

## Packaging - Requires cpio (#979) - Requires python3-gobject-base, NetworkManager-libnm (#969) - Bump leapp-repository-dependencies to 9 (#969, #979) ## Upgrade handling ### Fixes - Add leapp RHUI packages to an allowlist to drop confusing reports (#995) - Check only mounted XFS partitions (#1027) - Detect the kernel-core RPM instead of kernel to prevent an error during post-upgrade phases (#1024) - Disable the amazon-id DNF plugin on AWS during the upgrade stage to omit error messages during the upgrade process caused by missing network connection (#990) - Do not create new *pyc files when running leapp after the DNF upgrade transaction (#1017) - Enable upgrades on s390x when /boot is part of rootfs (#991) - Extend the allow list of RHUI clients by azure-sap-apps to omit confusing report (#974) - Filter out PES events unrelated for the used upgrade path and handle overlapping events (#1008) - Fix scan of ceph volumes on systems without ceph-osd (#1011) - Fix scan of ceph volumes when ceph-osd container is not found (#986) - Fix systemd symlinks that become incorrect during the IPU (#972) - Fix the check of memory (RAM) limits (#984) - Fix the upgrade of IBM Z machines configured with ZFCP (#983) - Ignore external accounts in /etc/passwd (#958) - Inhibit the upgrade when entries in /etc/fstab cause overshadowing during the upgrade (#1009) - Prevent leapp failures caused by re-run of leapp in the upgrade initramfs after previous failure, which causes additional confusing error message hiding original bugs (#996) - Prevent the upgrade with RHSM when a baseos and an appstream target repositories are not discovered (#1001) - RHUI(Azure) handle correctly various SAP images (#1037) - Rework the network configuration handling and parse the configuration data properly (#969) - Set RHSM release for non-ga and non-beta channels (#1033) - Use the "grub" library to find the GRUB device (#989) - [IPU 7 -> 8] Detect corrupted grubenv file (#1012) - [IPU 7 -> 8] Ensure that rsyncd stays enabled if it is enabled prior the upgrade(#1043) - [IPU 7 -> 8] Ensure that satellite metapackages are installed after the upgrade (#994) - [IPU 7 -> 8] Ensure the device_cio_free service stays enabled on s390x after the upgrade (#977) - [IPU 7 -> 8] Fixed checks for RHEL SAP IPU 7.9 -> 8.6 (#978) - [IPU 7 -> 8] Fixed migration of ntp to chrony when the ntp service is masked (#966) - [IPU 7 -> 8] Prevent the traceback during migration of sendmail configuration files when the package is not installed (#1041) - [IPU 7 -> 8] Satellite: reindex all related databases to fix issues due to new locales in RHEL 8 (#1007, #1018) - [IPU 7 -> 8] Use the correct domain name in SSSD reports (#1040) - [IPU 8 -> 9] Added checks for RHEL SAP IPU 8.6 -> 9.0 (#978) - [IPU 8 -> 9] CheckVDO: Ask user for the confirmation only on failures and undetermined devices (#961) - [IPU 8 -> 9] Fix the kernel detection during initramfs creation for new kernel on RHEL 9.2+ (#1048) - [IPU 8 -> 9] Fix the upgrade on Azure using RHUI for SAP Apps images (#975) - [IPU 8 -> 9] Handle correctly firewalld version 0.8 (#963) ### Enhancements - Set new upgrade paths (#988): -- RHEL 7.9 -> 8.8, 8.6 (default: 8.8) -- RHEL 8.6 -> 9.0 -- RHEL 8.8 -> 9.2 - Check that used leapp data are valid and compatible with the installed leapp-repository (#1003) - Detect a proxy configuration in YUM/DNF and adjust an error msg on issues caused by the configuration (#914) - Detect and report systemd symlinks that are broken before the upgrade (#972) - Drop obsoleted upgrade paths (#1047) - Improve remediation instructions for packages in unknown repositories (#1010) - Improve the error message to guide users when discovered more space is needed (#956) - Introduce --nogpgcheck option to skip checking of RPM signatures (#910) - Introduced an option to use an ISO file as a target RHEL version content source (#979) - Introduced possibility to specify what systemd services should be enabled/disabled on the upgraded system (#964) - Map the target repositories also based on the installed content (#967) - Provide common information about systemd services (#959) - Register subscribed systems automatically to Red Hat Insights unless --no-insights-register is used (#1000) - Remove obsoleted GPG keys provided by RH after the upgrade to prevent errors (#1022) - Run upgrade process with checking RPM signatures by default (#910, #993, #1025) - Save breadcrumbs results as RHSM facts (#1002) - Small improvements in various reports (#1038, #1039, #1032) - [IPU 8 -> 9] Detect CIFS also when upgrading from RHEL8 to RHEL9 (PR1035) - [IPU 8 -> 9] Detect RoCE on IBM Z machines and check the configuration is safe for the upgrade (#1030) - [IPU 8 -> 9] Enable upgrades of RHEL 8 for SAP HANA to RHEL 9 on ppc64le (#1042) - [IPU 8 -> 9] Improve the handling of blocklisted certificates (#992) ## Additional changes interesting for devels - Started work on bringing up networking inside the upgrade initramfs - currently available for testing and development purposes when LEAPP_DEVEL_INITRAM_NETWORK is set (#960) - Add leapp debug tools to the upgrade initramfs - dracut upgrade module (#997) - Enable disabling of DNF plugins in the dnfplugin library (#990)

pirat89 force-pushed the zfcp+zipl branch from 52bb45b to 400ad57 Compare November 7, 2022 19:05

pirat89 added the bug Something isn't working label Nov 7, 2022

pirat89 self-assigned this Nov 7, 2022

pirat89 force-pushed the zfcp+zipl branch from 400ad57 to 2b8e80f Compare November 7, 2022 19:17

pirat89 added this to the 8.8/9.2 milestone Nov 8, 2022

pirat89 approved these changes Nov 11, 2022

View reviewed changes

pirat89 merged commit a6445b3 into oamg:master Nov 11, 2022

pirat89 added the changelog-checked The merger/reviewer checked the changelog draft document and updated it when relevant label Feb 21, 2023

pirat89 mentioned this pull request Feb 21, 2023

# Release 0.18.0 #1049

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

s390x fixes: zfcp+zipl #983

s390x fixes: zfcp+zipl #983

rmetrich commented Nov 7, 2022 •

edited by pirat89

github-actions bot commented Nov 7, 2022

leapp-bot commented Nov 7, 2022

pirat89 commented Nov 7, 2022

pirat89 commented Nov 7, 2022

rmetrich commented Nov 8, 2022

pirat89 commented Nov 9, 2022

github-actions bot commented Nov 9, 2022

github-actions bot commented Nov 9, 2022

github-actions bot commented Nov 9, 2022

github-actions bot commented Nov 9, 2022

github-actions bot commented Nov 9, 2022

github-actions bot commented Nov 9, 2022

github-actions bot commented Nov 9, 2022

github-actions bot commented Nov 9, 2022

github-actions bot commented Nov 9, 2022

s390x fixes: zfcp+zipl #983

s390x fixes: zfcp+zipl #983

Conversation

rmetrich commented Nov 7, 2022 • edited by pirat89

github-actions bot commented Nov 7, 2022

Thank you for contributing to the Leapp project!

leapp-bot commented Nov 7, 2022

pirat89 commented Nov 7, 2022

pirat89 commented Nov 7, 2022

rmetrich commented Nov 8, 2022

pirat89 commented Nov 9, 2022

github-actions bot commented Nov 9, 2022

github-actions bot commented Nov 9, 2022

github-actions bot commented Nov 9, 2022

github-actions bot commented Nov 9, 2022

github-actions bot commented Nov 9, 2022

github-actions bot commented Nov 9, 2022

github-actions bot commented Nov 9, 2022

github-actions bot commented Nov 9, 2022

github-actions bot commented Nov 9, 2022

rmetrich commented Nov 7, 2022 •

edited by pirat89