From feee765f99da518076b6a238de07d9dd5983606d Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Thu, 11 Mar 2010 14:04:12 -0800 Subject: [PATCH] Remove promise example config replace with a supermicro config The promise config never worked quite right. I'm replacing it with a Supermicro config which does and which I've tested on a real test system. --- etc/zfs/zdev.conf.promise.example | 26 ---------------- etc/zfs/zdev.conf.supermicro.example | 30 +++++++++++++++++++ ...raid0-1x16.sh => supermicro-raid0-1x16.sh} | 10 +++---- ...raid10-8x2.sh => supermicro-raid10-8x2.sh} | 10 +++---- ...e-raidz-2x8.sh => supermicro-raidz-4x4.sh} | 10 +++---- ...raidz2-2x8.sh => supermicro-raidz2-4x4.sh} | 10 +++---- 6 files changed, 50 insertions(+), 46 deletions(-) delete mode 100644 etc/zfs/zdev.conf.promise.example create mode 100644 etc/zfs/zdev.conf.supermicro.example rename scripts/zpool-config/{promise-raid0-1x16.sh => supermicro-raid0-1x16.sh} (61%) rename scripts/zpool-config/{promise-raid10-8x2.sh => supermicro-raid10-8x2.sh} (61%) rename scripts/zpool-config/{promise-raidz-2x8.sh => supermicro-raidz-4x4.sh} (61%) rename scripts/zpool-config/{promise-raidz2-2x8.sh => supermicro-raidz2-4x4.sh} (61%) diff --git a/etc/zfs/zdev.conf.promise.example b/etc/zfs/zdev.conf.promise.example deleted file mode 100644 index 8b068f89d0..0000000000 --- a/etc/zfs/zdev.conf.promise.example +++ /dev/null @@ -1,26 +0,0 @@ -# -# Custom by-path mapping for large JBOD configurations -# -# Example Config: -# Single promise JBOD for RHEL6 -# - -# Channel A: PCI Bus 7, Enclosure 0x500304800027367f -a1 pci-0000:07:00.0-sas-0x500304800027367f-0 -a2 pci-0000:07:00.0-sas-0x500304800027367f-1 -a3 pci-0000:07:00.0-sas-0x500304800027367f-2 -a4 pci-0000:07:00.0-sas-0x500304800027367f-3 -a5 pci-0000:07:00.0-sas-0x500304800027367f-4 -a6 pci-0000:07:00.0-sas-0x500304800027367f-5 -a7 pci-0000:07:00.0-sas-0x500304800027367f-6 -a8 pci-0000:07:00.0-sas-0x500304800027367f-7 - -# Channel B: PCI Bus 7, Enclosure 0x500304800027367f -b1 pci-0000:07:00.0-sas-0x500304800027367f-8 -b2 pci-0000:07:00.0-sas-0x500304800027367f-9 -b3 pci-0000:07:00.0-sas-0x500304800027367f-10 -b4 pci-0000:07:00.0-sas-0x500304800027367f-11 -b5 pci-0000:07:00.0-sas-0x500304800027367f-12 -b6 pci-0000:07:00.0-sas-0x500304800027367f-13 -b7 pci-0000:07:00.0-sas-0x500304800027367f-14 -b8 pci-0000:07:00.0-sas-0x500304800027367f-15 diff --git a/etc/zfs/zdev.conf.supermicro.example b/etc/zfs/zdev.conf.supermicro.example new file mode 100644 index 0000000000..f20dcc081e --- /dev/null +++ b/etc/zfs/zdev.conf.supermicro.example @@ -0,0 +1,30 @@ +# +# Custom by-path mapping for large JBOD configurations +# +# Example Config: +# Single Supermicro JBOD for RHEL6 +# + +# Channel A: PCI Bus 7, Enclosure 0x500304800027367f +a1 pci-0000:07:00.0-sas-0x500304800027367f-0 +a2 pci-0000:07:00.0-sas-0x500304800027367f-1 +a3 pci-0000:07:00.0-sas-0x500304800027367f-2 +a4 pci-0000:07:00.0-sas-0x500304800027367f-3 + +# Channel B: PCI Bus 7, Enclosure 0x500304800027367f +b1 pci-0000:07:00.0-sas-0x500304800027367f-4 +b2 pci-0000:07:00.0-sas-0x500304800027367f-5 +b3 pci-0000:07:00.0-sas-0x500304800027367f-6 +b4 pci-0000:07:00.0-sas-0x500304800027367f-7 + +# Channel C: PCI Bus 7, Enclosure 0x500304800027367f +c1 pci-0000:07:00.0-sas-0x500304800027367f-8 +c2 pci-0000:07:00.0-sas-0x500304800027367f-9 +c3 pci-0000:07:00.0-sas-0x500304800027367f-10 +c4 pci-0000:07:00.0-sas-0x500304800027367f-11 + +# Channel D: PCI Bus 7, Enclosure 0x500304800027367f +d1 pci-0000:07:00.0-sas-0x500304800027367f-12 +d2 pci-0000:07:00.0-sas-0x500304800027367f-13 +d3 pci-0000:07:00.0-sas-0x500304800027367f-14 +d4 pci-0000:07:00.0-sas-0x500304800027367f-15 diff --git a/scripts/zpool-config/promise-raid0-1x16.sh b/scripts/zpool-config/supermicro-raid0-1x16.sh similarity index 61% rename from scripts/zpool-config/promise-raid0-1x16.sh rename to scripts/zpool-config/supermicro-raid0-1x16.sh index 9a2bede66e..efe48459df 100644 --- a/scripts/zpool-config/promise-raid0-1x16.sh +++ b/scripts/zpool-config/supermicro-raid0-1x16.sh @@ -1,13 +1,13 @@ #!/bin/bash # -# Flash (White Box) Raid-0 Configuration (1x16) +# Supermicro (White Box) Raid-0 Configuration (1x16) # -RANKS=8 -CHANNELS=2 +RANKS=4 +CHANNELS=4 zpool_create() { - udev_setup ${ETCDIR}/zfs/zdev.conf.promise.example + udev_setup ${ETCDIR}/zfs/zdev.conf.supermicro.example udev_raid0_setup ${RANKS} ${CHANNELS} msg ${ZPOOL} create ${FORCE_FLAG} ${ZPOOL_NAME} ${RAID0S[*]} @@ -17,5 +17,5 @@ zpool_create() { zpool_destroy() { msg ${ZPOOL} destroy ${ZPOOL_NAME} ${ZPOOL} destroy ${ZPOOL_NAME} - udev_cleanup ${ETCDIR}/zfs/zdev.conf.promise.example + udev_cleanup ${ETCDIR}/zfs/zdev.conf.supermicro.example } diff --git a/scripts/zpool-config/promise-raid10-8x2.sh b/scripts/zpool-config/supermicro-raid10-8x2.sh similarity index 61% rename from scripts/zpool-config/promise-raid10-8x2.sh rename to scripts/zpool-config/supermicro-raid10-8x2.sh index e6fc6c4f69..a6e6be6c02 100644 --- a/scripts/zpool-config/promise-raid10-8x2.sh +++ b/scripts/zpool-config/supermicro-raid10-8x2.sh @@ -1,13 +1,13 @@ #!/bin/bash # -# Flash (White Box) Raid-10 Configuration (10x2(1+1)) +# Supermicro (White Box) Raid-10 Configuration (8x2(1+1)) # -RANKS=8 -CHANNELS=2 +RANKS=4 +CHANNELS=4 zpool_create() { - udev_setup ${ETCDIR}/zfs/zdev.conf.promise.example + udev_setup ${ETCDIR}/zfs/zdev.conf.supermicro.example udev_raid10_setup ${RANKS} ${CHANNELS} msg ${ZPOOL} create ${FORCE_FLAG} ${ZPOOL_NAME} ${RAID10S[*]} @@ -17,5 +17,5 @@ zpool_create() { zpool_destroy() { msg ${ZPOOL} destroy ${ZPOOL_NAME} ${ZPOOL} destroy ${ZPOOL_NAME} - udev_cleanup ${ETCDIR}/zfs/zdev.conf.promise.example + udev_cleanup ${ETCDIR}/zfs/zdev.conf.supermicro.example } diff --git a/scripts/zpool-config/promise-raidz-2x8.sh b/scripts/zpool-config/supermicro-raidz-4x4.sh similarity index 61% rename from scripts/zpool-config/promise-raidz-2x8.sh rename to scripts/zpool-config/supermicro-raidz-4x4.sh index 85bba2a781..9ed2780e9d 100644 --- a/scripts/zpool-config/promise-raidz-2x8.sh +++ b/scripts/zpool-config/supermicro-raidz-4x4.sh @@ -1,13 +1,13 @@ #!/bin/bash # -# Flash (White Box) Raid-Z Configuration (2x8(7+1)) +# Supermicro (White Box) Raid-Z Configuration (4x4(3+1)) # -RANKS=8 -CHANNELS=2 +RANKS=4 +CHANNELS=4 zpool_create() { - udev_setup ${ETCDIR}/zfs/zdev.conf.promise.example + udev_setup ${ETCDIR}/zfs/zdev.conf.supermicro.example udev_raidz_setup ${RANKS} ${CHANNELS} msg ${ZPOOL} create ${FORCE_FLAG} ${ZPOOL_NAME} ${RAIDZS[*]} @@ -17,5 +17,5 @@ zpool_create() { zpool_destroy() { msg ${ZPOOL} destroy ${ZPOOL_NAME} ${ZPOOL} destroy ${ZPOOL_NAME} - udev_cleanup ${ETCDIR}/zfs/zdev.conf.promise.example + udev_cleanup ${ETCDIR}/zfs/zdev.conf.supermicro.example } diff --git a/scripts/zpool-config/promise-raidz2-2x8.sh b/scripts/zpool-config/supermicro-raidz2-4x4.sh similarity index 61% rename from scripts/zpool-config/promise-raidz2-2x8.sh rename to scripts/zpool-config/supermicro-raidz2-4x4.sh index d2ef24810a..ed3eedfdf0 100644 --- a/scripts/zpool-config/promise-raidz2-2x8.sh +++ b/scripts/zpool-config/supermicro-raidz2-4x4.sh @@ -1,13 +1,13 @@ #!/bin/bash # -# Flash (White Box) Raid-Z2 Configuration (2x8(6+2)) +# Supermicro (White Box) Raid-Z2 Configuration (4x4(2+2)) # -RANKS=8 -CHANNELS=2 +RANKS=4 +CHANNELS=4 zpool_create() { - udev_setup ${ETCDIR}/zfs/zdev.conf.promise.example + udev_setup ${ETCDIR}/zfs/zdev.conf.supermicro.example udev_raidz2_setup ${RANKS} ${CHANNELS} msg ${ZPOOL} create ${FORCE_FLAG} ${ZPOOL_NAME} ${RAIDZ2S[*]} @@ -17,5 +17,5 @@ zpool_create() { zpool_destroy() { msg ${ZPOOL} destroy ${ZPOOL_NAME} ${ZPOOL} destroy ${ZPOOL_NAME} - udev_cleanup ${ETCDIR}/zfs/zdev.conf.promise.example + udev_cleanup ${ETCDIR}/zfs/zdev.conf.supermicro.example }