diff options
author | Ned A. Bass <[email protected]> | 2011-06-21 16:18:27 -0700 |
---|---|---|
committer | Brian Behlendorf <[email protected]> | 2011-06-23 10:46:06 -0700 |
commit | 560bcf9d14a63e2cef4dd49d61399c8a865c1348 (patch) | |
tree | c077c852fe1a91c51d72e42951b888feab898906 /cmd/zpool_id | |
parent | 7e7baecaa321ce4e96938a02b87ab22a7939e422 (diff) |
Multipath device manageability improvements
Update udev helper scripts to deal with device-mapper devices created
by multipathd. These enhancements are targeted at a particular
storage network topology under evaluation at LLNL consisting of two
SAS switches providing redundant connectivity between multiple server
nodes and disk enclosures.
The key to making these systems manageable is to create shortnames for
each disk that conveys its physical location in a drawer. In a
direct-attached topology we infer a disk's enclosure from the PCI bus
number and HBA port number in the by-path name provided by udev. In a
switched topology, however, multiple drawers are accessed via a single
HBA port. We therefore resort to assigning drawer identifiers based
on which switch port a drive's enclosure is connected to. This
information is available from sysfs.
Add options to zpool_layout to generate an /etc/zfs/zdev.conf using
symbolic links in /dev/disk/by-id of the form
<label>-<UUID>-switch-port:<X>-slot:<Y>. <label> is a string that
depends on the subsystem that created the link and defaults to
"dm-uuid-mpath" (this prefix is used by multipathd). <UUID> is a
unique identifier for the disk typically obtained from the scsi_id
program, and <X> and <Y> denote the switch port and disk slot numbers,
respectively.
Add a callout script sas_switch_id for use by multipathd to help
create symlinks of the form described above. Update zpool_id and the
udev zpool rules file to handle both multipath devices and
conventional drives.
Diffstat (limited to 'cmd/zpool_id')
-rwxr-xr-x | cmd/zpool_id/zpool_id | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/cmd/zpool_id/zpool_id b/cmd/zpool_id/zpool_id index f74504cfb..9d2a84549 100755 --- a/cmd/zpool_id/zpool_id +++ b/cmd/zpool_id/zpool_id @@ -39,9 +39,17 @@ done # Check for the existence of a configuration file [ ! -f ${CONFIG} ] && die "Missing config file: ${CONFIG}" -# Use udev's path_id to generate a unique persistent key -eval `${PATH_ID} ${DEVICE}` -[ -z ${ID_PATH} ] && die "Missing ID_PATH for ${DEVICE}" +# If we are handling a multipath device then $DM_UUID will be +# exported and we'll use its value (prefixed with dm-uuid per +# multipathd's naming convention) as our unique persistent key. +# For traditional devices we'll obtain the key from udev's +# path_id. +if [ -n "${DM_UUID}" ] && echo ${DM_UUID} | egrep -q -e '^mpath' ; then + ID_PATH="dm-uuid-${DM_UUID}" +else + eval `${PATH_ID} ${DEVICE}` + [ -z ${ID_PATH} ] && die "Missing ID_PATH for ${DEVICE}" +fi # Use the persistent key to lookup the zpool device id in the # configuration file which is of the format <device id> <key>. |