mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2026-05-22 10:37:35 +03:00
Retire zpool_id infrastructure
In the interest of maintaining only one udev helper to give vdevs user friendly names, the zpool_id and zpool_layout infrastructure is being retired. They are superseded by vdev_id which incorporates all the previous functionality. Documentation for the new vdev_id(8) helper and its configuration file, vdev_id.conf(5), can be found in their respective man pages. Several useful example files are installed under /etc/zfs/. /etc/zfs/vdev_id.conf.alias.example /etc/zfs/vdev_id.conf.multipath.example /etc/zfs/vdev_id.conf.sas_direct.example /etc/zfs/vdev_id.conf.sas_switch.example Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> Closes #981
This commit is contained in:
Brian Behlendorf
+1
-1
@@ -1,4 +1,4 @@
|
||||
SUBDIRS = zpool-config zpool-layout zpios-test zpios-profile
|
||||
SUBDIRS = zpool-config zpios-test zpios-profile
|
||||
|
||||
pkglibexecdir = $(libexecdir)/@PACKAGE@
|
||||
dist_pkglibexec_SCRIPTS = \
|
||||
|
||||
@@ -41,7 +41,7 @@ udevruledir=@udevruledir@
|
||||
sysconfdir=@sysconfdir@
|
||||
|
||||
ETCDIR=${ETCDIR:-/etc}
|
||||
DEVDIR=${DEVDIR:-/dev/disk/zpool}
|
||||
DEVDIR=${DEVDIR:-/dev/disk/by-vdev}
|
||||
ZPOOLDIR=${ZPOOLDIR:-${pkglibexecdir}/zpool-config}
|
||||
ZPIOSDIR=${ZPIOSDIR:-${pkglibexecdir}/zpios-test}
|
||||
ZPIOSPROFILEDIR=${ZPIOSPROFILEDIR:-${pkglibexecdir}/zpios-profile}
|
||||
@@ -50,7 +50,6 @@ ZDB=${ZDB:-${sbindir}/zdb}
|
||||
ZFS=${ZFS:-${sbindir}/zfs}
|
||||
ZINJECT=${ZINJECT:-${sbindir}/zinject}
|
||||
ZPOOL=${ZPOOL:-${sbindir}/zpool}
|
||||
ZPOOL_ID=${ZPOOL_ID:-${bindir}/zpool_id}
|
||||
ZTEST=${ZTEST:-${sbindir}/ztest}
|
||||
ZPIOS=${ZPIOS:-${sbindir}/zpios}
|
||||
|
||||
@@ -525,7 +524,7 @@ udev_trigger() {
|
||||
|
||||
#
|
||||
# The following udev helper functions assume that the provided
|
||||
# udev rules file will create a /dev/disk/zpool/<CHANNEL><RANK>
|
||||
# udev rules file will create a /dev/disk/by-vdev/<CHANNEL><RANK>
|
||||
# disk mapping. In this mapping each CHANNEL is represented by
|
||||
# the letters a-z, and the RANK is represented by the numbers
|
||||
# 1-n. A CHANNEL should identify a group of RANKS which are all
|
||||
|
||||
@@ -2,10 +2,9 @@
|
||||
#
|
||||
# Zpool Raid-0 Configuration
|
||||
#
|
||||
# This script is used to simplify testing with the /dev/disk/zpool/[A-Z][1-n]
|
||||
# devices. It assumes that you have already populated /dev/disk/zpool/ by
|
||||
# creating an /etc/zfs/zdev.conf file based on your system design. You may
|
||||
# use the zpool_layout command or manually create your own config file.
|
||||
# This script is used to test with the /dev/disk/by-vdev/[A-Z][1-n] devices.
|
||||
# It assumes that you have already populated /dev/disk/by-vdev/ by creating
|
||||
# an /etc/zfs/vdev_id.conf file based on your system design.
|
||||
#
|
||||
# You can then use either the zpool-create.sh or the zpios.sh test script to
|
||||
# test various Raid-0 configurations by adjusting the following tunables.
|
||||
|
||||
@@ -2,10 +2,9 @@
|
||||
#
|
||||
# Zpool Raid-10 Configuration
|
||||
#
|
||||
# This script is used to simplify testing with the /dev/disk/zpool/[A-Z][1-n]
|
||||
# devices. It assumes that you have already populated /dev/disk/zpool/ by
|
||||
# creating an /etc/zfs/zdev.conf file based on your system design. You may
|
||||
# use the zpool_layout command or manually create your own config file.
|
||||
# This script is used to test with the /dev/disk/by-vdev/[A-Z][1-n] devices.
|
||||
# It assumes that you have already populated /dev/disk/by-vdev/ by creating
|
||||
# an /etc/zfs/vdev_id.conf file based on your system design.
|
||||
#
|
||||
# You can then use either the zpool-create.sh or the zpios.sh test script to
|
||||
# test various Raid-10 configurations by adjusting the following tunables.
|
||||
|
||||
@@ -2,10 +2,9 @@
|
||||
#
|
||||
# Zpool Raid-Z Configuration
|
||||
#
|
||||
# This script is used to simplify testing with the /dev/disk/zpool/[A-Z][1-n]
|
||||
# devices. It assumes that you have already populated /dev/disk/zpool/ by
|
||||
# creating an /etc/zfs/zdev.conf file based on your system design. You may
|
||||
# use the zpool_layout command or manually create your own config file.
|
||||
# This script is used to test with the /dev/disk/by-vdev/[A-Z][1-n] devices.
|
||||
# It assumes that you have already populated /dev/disk/by-vdev/ by creating
|
||||
# an /etc/zfs/vdev_id.conf file based on your system design.
|
||||
#
|
||||
# You can then use either the zpool-create.sh or the zpios.sh test script to
|
||||
# test various Raid-Z configurations by adjusting the following tunables.
|
||||
|
||||
@@ -1,22 +0,0 @@
|
||||
pkglibexecdir = $(libexecdir)/@PACKAGE@/zpool-layout
|
||||
dist_pkglibexec_SCRIPTS = \
|
||||
$(top_srcdir)/scripts/zpool-layout/dragon.ddn.conf \
|
||||
$(top_srcdir)/scripts/zpool-layout/dragon.llnl.conf
|
||||
|
||||
all:
|
||||
@list='$(dist_pkglibexec_SCRIPTS)'; \
|
||||
for file in $$list; do \
|
||||
link=$$(basename $$file); \
|
||||
if [ ! -e $$link ]; then \
|
||||
$(LN_S) $$file $$link; \
|
||||
fi \
|
||||
done
|
||||
|
||||
clean:
|
||||
@list='$(dist_pkglibexec_SCRIPTS)'; \
|
||||
for file in $$list; do \
|
||||
link=$$(basename $$file); \
|
||||
if [ -L $$link ]; then \
|
||||
$(RM) $$link; \
|
||||
fi \
|
||||
done
|
||||
@@ -1,67 +0,0 @@
|
||||
#
|
||||
# Custom DDN slot mapping for zpool_layout command and
|
||||
# StorageScaler 6000 enclosures (Dragon Drawer).
|
||||
#
|
||||
# Linux DDN
|
||||
# Slot Slot
|
||||
#
|
||||
1 1
|
||||
2 13
|
||||
3 25
|
||||
4 37
|
||||
5 49
|
||||
6 2
|
||||
7 14
|
||||
8 26
|
||||
9 38
|
||||
10 50
|
||||
11 3
|
||||
12 15
|
||||
13 27
|
||||
14 39
|
||||
15 51
|
||||
16 4
|
||||
17 16
|
||||
18 28
|
||||
19 40
|
||||
20 52
|
||||
21 5
|
||||
22 17
|
||||
23 29
|
||||
24 41
|
||||
25 53
|
||||
26 6
|
||||
27 18
|
||||
28 30
|
||||
29 42
|
||||
30 54
|
||||
31 7
|
||||
32 19
|
||||
33 31
|
||||
34 43
|
||||
35 55
|
||||
36 8
|
||||
37 20
|
||||
38 32
|
||||
39 44
|
||||
40 56
|
||||
41 9
|
||||
42 21
|
||||
43 33
|
||||
44 45
|
||||
45 57
|
||||
46 10
|
||||
47 22
|
||||
48 34
|
||||
49 46
|
||||
50 58
|
||||
51 11
|
||||
52 23
|
||||
53 35
|
||||
54 47
|
||||
55 59
|
||||
56 12
|
||||
57 24
|
||||
58 36
|
||||
59 48
|
||||
60 60
|
||||
@@ -1,67 +0,0 @@
|
||||
#
|
||||
# Custom LLNL slot mapping for zpool_layout command and
|
||||
# StorageScaler 6000 enclosures (Dragon Drawer).
|
||||
#
|
||||
# Linux LLNL
|
||||
# Slot Slot
|
||||
#
|
||||
1 25
|
||||
2 19
|
||||
3 13
|
||||
4 7
|
||||
5 1
|
||||
6 26
|
||||
7 20
|
||||
8 14
|
||||
9 8
|
||||
10 2
|
||||
11 27
|
||||
12 21
|
||||
13 15
|
||||
14 9
|
||||
15 3
|
||||
16 28
|
||||
17 22
|
||||
18 16
|
||||
19 10
|
||||
20 4
|
||||
21 29
|
||||
22 23
|
||||
23 17
|
||||
24 11
|
||||
25 5
|
||||
26 30
|
||||
27 24
|
||||
28 18
|
||||
29 12
|
||||
30 6
|
||||
31 60
|
||||
32 54
|
||||
33 48
|
||||
34 42
|
||||
35 36
|
||||
36 59
|
||||
37 53
|
||||
38 47
|
||||
39 41
|
||||
40 35
|
||||
41 58
|
||||
42 52
|
||||
43 46
|
||||
44 40
|
||||
45 34
|
||||
46 57
|
||||
47 51
|
||||
48 45
|
||||
49 39
|
||||
50 33
|
||||
51 56
|
||||
52 50
|
||||
53 44
|
||||
54 38
|
||||
55 32
|
||||
56 55
|
||||
57 49
|
||||
58 43
|
||||
59 37
|
||||
60 31
|
||||
Reference in New Issue
Block a user