mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2026-05-22 02:27:36 +03:00
Add support for devid and phys_path keys in vdev disk labels
This is foundational work for ZED.
Updates a leaf vdev's persistent device strings on Linux platform
* only applies for a dedicated leaf vdev (aka whole disk)
* updated during pool create|add|attach|import
* used for matching device matching during auto-{online,expand,replace}
* stored in a leaf disk config label (i.e. alongside 'path' NVP)
* can opt-out using env var ZFS_VDEV_DEVID_OPT_OUT=YES
Some examples:
path: '/dev/sdb1'
devid: 'scsi-350000394a8ca4fbc-part1'
phys_path: 'pci-0000:04:00.0-sas-0x50000394a8ca4fbf-lun-0'
path: '/dev/mapper/mpatha'
devid: 'dm-uuid-mpath-35000c5006304de3f'
Signed-off-by: Don Brady <don.brady@intel.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #2856
Closes #3978
Closes #4416
This commit is contained in:
committed by
Brian Behlendorf
parent
bebd73f2c3
commit
39fc0cb557
+14
-1
@@ -22,6 +22,7 @@
|
||||
/*
|
||||
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2013 by Delphix. All rights reserved.
|
||||
* Copyright (c) 2016 Intel Corporation.
|
||||
*/
|
||||
|
||||
/*
|
||||
@@ -447,7 +448,7 @@ check_disk(const char *path, blkid_cache cache, int force,
|
||||
(void) close(fd);
|
||||
|
||||
if (force) {
|
||||
/* Partitions will no be created using the backup */
|
||||
/* Partitions will now be created using the backup */
|
||||
return (0);
|
||||
} else {
|
||||
vdev_error(gettext("%s contains a corrupt primary "
|
||||
@@ -1178,6 +1179,12 @@ make_disks(zpool_handle_t *zhp, nvlist_t *nv)
|
||||
&wholedisk));
|
||||
|
||||
if (!wholedisk) {
|
||||
/*
|
||||
* Update device id string for mpath nodes (Linux only)
|
||||
*/
|
||||
if (is_mpath_whole_disk(path))
|
||||
update_vdev_config_dev_strs(nv);
|
||||
|
||||
(void) zero_label(path);
|
||||
return (0);
|
||||
}
|
||||
@@ -1249,6 +1256,12 @@ make_disks(zpool_handle_t *zhp, nvlist_t *nv)
|
||||
*/
|
||||
verify(nvlist_add_string(nv, ZPOOL_CONFIG_PATH, udevpath) == 0);
|
||||
|
||||
/*
|
||||
* Update device id strings for whole disks (Linux only)
|
||||
*/
|
||||
if (wholedisk)
|
||||
update_vdev_config_dev_strs(nv);
|
||||
|
||||
return (0);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user