MGMT-19670, MGMT-19484: Enable multipath + iSCSI as installation disk #7192

linoyaslan · 2025-01-15T10:21:03Z

Building on the work done to enable iSCSI as an installation disk, this PR extends support to enable multipath+iSCSI as an installation disk.

/cc @adriengentil

List all the issues related to this PR

What environments does this code impact?

Automation (CI, tools, etc)
Cloud
Operator Managed Deployments
None

How was this code tested?

assisted-test-infra environment
dev-scripts environment
Reviewer's test appreciated
Waiting for CI to do a full test run
Manual (Elaborate on how it was tested)
No tests needed

Checklist

Title and description added to both, commit and PR.
Relevant issues have been associated (see CONTRIBUTING guide)
This change does not require a documentation update (docstring, docs, README, etc)
Does this change include unit-tests (note that code changes require unit-tests)

Reviewers Checklist

Are the title and description (in both PR and commit) meaningful and clear?
Is there a bug required (and linked) for this change?
Should this PR be backported?

openshift-ci-robot · 2025-01-15T10:21:07Z

openshift-ci · 2025-01-15T10:21:59Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: linoyaslan

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [linoyaslan]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

openshift-ci-robot · 2025-01-15T10:22:44Z

linoyaslan · 2025-01-15T10:26:43Z

/cc @adriengentil

openshift-ci-robot · 2025-01-15T10:53:15Z

internal/host/hostcommands/install_cmd.go

adriengentil · 2025-01-15T10:48:52Z

internal/host/hostcommands/install_cmd.go

+				dhcp = "dhcp6"
+			}
+			installerArgs = append(installerArgs, "--append-karg", fmt.Sprintf("ip=%s:%s", nic.Name, dhcp))
+			break


we may have several disks connected through different interfaces, I think we should not break

adriengentil · 2025-01-15T10:50:17Z

internal/network/manifests_generator.go

@@ -556,7 +556,7 @@ spec:
            [Service]
            Type=oneshot
            ExecStart=-/bin/sh -c '                                                      \
-            lsblk -o NAME,TRAN,MOUNTPOINTS --json | jq -e \'.blockdevices[] | select(.tran == "iscsi") | select(.children) | .children[].mountpoints | select(.) | index("/sysroot") | select(.)\' > /dev/null; \
+            (lsblk -o NAME,TRAN,MOUNTPOINTS --json | jq -e ".blockdevices[] | select(.tran == \"iscsi\") | select(.children) | .children[] | select(.children) | .children[].mountpoints | select(.) | index(\"/sysroot\")" > /dev/null) || (lsblk -o NAME,TRAN,MOUNTPOINTS --json | jq -e ".blockdevices[] | select(.tran == \"iscsi\") | select(.children) | .children[].mountpoints | select(.) | index(\"/sysroot\")" > /dev/null); \


can you add an example? or maybe split in 2 conditions, in order to echo the right message below, depending if it's iSCSI boot or multipath+iscsi boot

What do you think of using a more generic message, such as "iSCSI / multipath+iSCSI boot volume detected, forcing network reconfiguration..." instead of splitting it into two separate conditions?

yeah, it would be fine. My main comment on this is to make the parsing of lsblk's output a bit clearer.

internal/network/manifests_generator.go

internal/hardware/validator.go

openshift-ci-robot · 2025-01-16T06:45:40Z

openshift-ci-robot · 2025-01-16T06:45:45Z

openshift-ci-robot · 2025-01-16T06:46:03Z

openshift-ci-robot · 2025-01-16T06:46:03Z

openshift-ci-robot · 2025-01-16T06:46:17Z

openshift-ci-robot · 2025-01-16T06:46:29Z

openshift-ci-robot · 2025-01-16T06:46:34Z

internal/host/hostcommands/install_cmd.go

internal/hardware/validator.go

adriengentil · 2025-01-16T09:49:53Z

internal/hardware/validator.go

 					notEligibleReasons = append(notEligibleReasons,
-						fmt.Sprintf(wrongMultipathTypeTemplate, inventoryDisk.DriveType, string(models.DriveTypeFC)))
+						fmt.Sprintf(wrongMultipathTypeTemplate, inventoryDisk.DriveType, fmt.Sprintf("%s or %s", string(models.DriveTypeFC), string(models.DriveTypeISCSI))))


I think the message should be be consistent with

assisted-service/internal/hardware/validator.go

Line 147 in 2e03b51

fmt.Sprintf(wrongDriveTypeTemplate, disk.DriveType, strings.Join(v.getValidDeviceStorageTypes(hostArchitecture, clusterVersion), ", ")))

Wouldn't it be better to have a specific message for multipath?

I mean the formatting should be consistent (with join and comma), not the the error message itself

I think here we don’t need to use join since it’s not a list of strings I want to concatenate. That’s why I used fmt.Sprintf to includ the strings FC and iSCSI.

internal/host/hostcommands/install_cmd.go

internal/network/manifests_generator.go

internal/host/hostcommands/install_cmd_test.go

internal/network/manifests_generator_test.go

internal/host/validator.go

This commit removes the disablement of multipath+iSCSI, updates the required kernel arguments, and extends the `nicReapplyManifest` workaround previously added for iSCSI to also support multipath+iSCSI.

This commit expand the 2 iSCSI validations, one during the discovery phase, which checks that the iSCSI disk is not connected through the default network interface (the one used by the default gateway), and another during the networking stage, ensuring that the disk does not belong to the machine's network.

linoyaslan · 2025-01-21T10:28:43Z

internal/host/hostcommands/install_cmd_test.go

+					"id": "other-id",
+					"drive_type": "%s",
+					"iscsi": {
+						"host_ip_address": "10.56.20.80"
+					},
+					"holders": "dm-0"
+				},
+				{
+					"id": "other-id-2",
+					"drive_type": "%s",
+					"iscsi": {
+						"host_ip_address": "10.56.20.81"
+					},
+					"holders": "dm-0"
+				}
+			],
+			"interfaces":[
+				{
+					"name": "eth0",
+					"ipv4_addresses":["10.56.20.80/25"]
+				},
+				{
+					"name": "eth1",
+					"ipv4_addresses":["10.56.20.81/25"]


@adriengentil Is this the missing test you were referring to?

openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jan 15, 2025

linoyaslan marked this pull request as draft January 15, 2025 10:21

openshift-ci bot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jan 15, 2025

openshift-ci bot requested review from paul-maidment and rccrdpccl January 15, 2025 10:21

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 15, 2025

openshift-ci bot requested a review from adriengentil January 15, 2025 10:27

linoyaslan changed the title ~~MGMT-19670, MGMT-19484: Enable multipath as installation disk~~ MGMT-19670, MGMT-19484: Enable multipath + iSCSI as installation disk Jan 15, 2025

linoyaslan force-pushed the MGMT-19670.enable_multipath branch from e9a87b7 to cea6d01 Compare January 15, 2025 10:57

adriengentil reviewed Jan 15, 2025

View reviewed changes

linoyaslan force-pushed the MGMT-19670.enable_multipath branch from cea6d01 to 564e22b Compare January 15, 2025 18:17

adriengentil reviewed Jan 16, 2025

View reviewed changes

internal/host/hostcommands/install_cmd.go Outdated Show resolved Hide resolved

adriengentil reviewed Jan 16, 2025

View reviewed changes

linoyaslan force-pushed the MGMT-19670.enable_multipath branch from 564e22b to c6e41ad Compare January 16, 2025 11:08

openshift-ci bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jan 16, 2025

adriengentil reviewed Jan 16, 2025

View reviewed changes

internal/network/manifests_generator.go Outdated Show resolved Hide resolved

paul-maidment reviewed Jan 16, 2025

View reviewed changes

internal/network/manifests_generator.go Show resolved Hide resolved

linoyaslan force-pushed the MGMT-19670.enable_multipath branch 3 times, most recently from b332d88 to d632ae5 Compare January 19, 2025 11:34

openshift-ci bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jan 19, 2025

linoyaslan force-pushed the MGMT-19670.enable_multipath branch 2 times, most recently from ba534db to 31e9d3c Compare January 19, 2025 12:42

openshift-ci bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jan 19, 2025

linoyaslan force-pushed the MGMT-19670.enable_multipath branch 6 times, most recently from 776ff8c to 688a891 Compare January 20, 2025 08:07

adriengentil reviewed Jan 20, 2025

View reviewed changes

internal/host/hostcommands/install_cmd_test.go Show resolved Hide resolved

adriengentil reviewed Jan 20, 2025

View reviewed changes

internal/network/manifests_generator_test.go Show resolved Hide resolved

adriengentil reviewed Jan 20, 2025

View reviewed changes

internal/host/validator.go Outdated Show resolved Hide resolved

linoyaslan force-pushed the MGMT-19670.enable_multipath branch 2 times, most recently from 7328a30 to 3ef9e24 Compare January 21, 2025 09:57

openshift-ci bot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jan 21, 2025

linoyaslan force-pushed the MGMT-19670.enable_multipath branch from 3ef9e24 to 73293b0 Compare January 21, 2025 09:59

linoyaslan added 2 commits January 21, 2025 12:26

Enable multipath + iSCSI as installation disk

5c4d86e

This commit removes the disablement of multipath+iSCSI, updates the required kernel arguments, and extends the `nicReapplyManifest` workaround previously added for iSCSI to also support multipath+iSCSI.

linoyaslan force-pushed the MGMT-19670.enable_multipath branch from 73293b0 to de6efcb Compare January 21, 2025 10:26

linoyaslan commented Jan 21, 2025

View reviewed changes

linoyaslan requested review from paul-maidment and adriengentil January 21, 2025 10:29

MGMT-19670, MGMT-19484: Enable multipath + iSCSI as installation disk #7192

Are you sure you want to change the base?

MGMT-19670, MGMT-19484: Enable multipath + iSCSI as installation disk #7192

Conversation

linoyaslan commented Jan 15, 2025 • edited Loading

List all the issues related to this PR

What environments does this code impact?

How was this code tested?

Checklist

Reviewers Checklist

openshift-ci-robot commented Jan 15, 2025 • edited by openshift-ci bot Loading

List all the issues related to this PR

What environments does this code impact?

How was this code tested?

Checklist

Reviewers Checklist

openshift-ci bot commented Jan 15, 2025

openshift-ci-robot commented Jan 15, 2025 • edited by openshift-ci bot Loading

List all the issues related to this PR

What environments does this code impact?

How was this code tested?

Checklist

Reviewers Checklist

linoyaslan commented Jan 15, 2025

openshift-ci-robot commented Jan 15, 2025 • edited by openshift-ci bot Loading

List all the issues related to this PR

What environments does this code impact?

How was this code tested?

Checklist

Reviewers Checklist

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

openshift-ci-robot commented Jan 16, 2025 • edited by openshift-ci bot Loading

List all the issues related to this PR

What environments does this code impact?

How was this code tested?

Checklist

Reviewers Checklist

openshift-ci-robot commented Jan 16, 2025 • edited by openshift-ci bot Loading

List all the issues related to this PR

What environments does this code impact?

How was this code tested?

Checklist

Reviewers Checklist

openshift-ci-robot commented Jan 16, 2025 • edited by openshift-ci bot Loading

List all the issues related to this PR

What environments does this code impact?

How was this code tested?

Checklist

Reviewers Checklist

openshift-ci-robot commented Jan 16, 2025 • edited by openshift-ci bot Loading

List all the issues related to this PR

What environments does this code impact?

How was this code tested?

Checklist

Reviewers Checklist

openshift-ci-robot commented Jan 16, 2025 • edited by openshift-ci bot Loading

List all the issues related to this PR

What environments does this code impact?

How was this code tested?

Checklist

Reviewers Checklist

openshift-ci-robot commented Jan 16, 2025 • edited by openshift-ci bot Loading

List all the issues related to this PR

What environments does this code impact?

How was this code tested?

Checklist

Reviewers Checklist

openshift-ci-robot commented Jan 16, 2025 • edited by openshift-ci bot Loading

List all the issues related to this PR

What environments does this code impact?

How was this code tested?

Checklist

Reviewers Checklist

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

linoyaslan commented Jan 15, 2025 •

edited

Loading

openshift-ci-robot commented Jan 15, 2025 •

edited by openshift-ci bot

Loading

openshift-ci-robot commented Jan 15, 2025 •

edited by openshift-ci bot

Loading

openshift-ci-robot commented Jan 15, 2025 •

edited by openshift-ci bot

Loading

openshift-ci-robot commented Jan 16, 2025 •

edited by openshift-ci bot

Loading

openshift-ci-robot commented Jan 16, 2025 •

edited by openshift-ci bot

Loading

openshift-ci-robot commented Jan 16, 2025 •

edited by openshift-ci bot

Loading

openshift-ci-robot commented Jan 16, 2025 •

edited by openshift-ci bot

Loading

openshift-ci-robot commented Jan 16, 2025 •

edited by openshift-ci bot

Loading

openshift-ci-robot commented Jan 16, 2025 •

edited by openshift-ci bot

Loading

openshift-ci-robot commented Jan 16, 2025 •

edited by openshift-ci bot

Loading