mirror of
https://git.FreeBSD.org/src.git
synced 2024-12-14 10:09:48 +00:00
b2255edcc0
This patch adds a new top-level vdev type called dRAID, which stands for Distributed parity RAID. This pool configuration allows all dRAID vdevs to participate when rebuilding to a distributed hot spare device. This can substantially reduce the total time required to restore full parity to pool with a failed device. A dRAID pool can be created using the new top-level `draid` type. Like `raidz`, the desired redundancy is specified after the type: `draid[1,2,3]`. No additional information is required to create the pool and reasonable default values will be chosen based on the number of child vdevs in the dRAID vdev. zpool create <pool> draid[1,2,3] <vdevs...> Unlike raidz, additional optional dRAID configuration values can be provided as part of the draid type as colon separated values. This allows administrators to fully specify a layout for either performance or capacity reasons. The supported options include: zpool create <pool> \ draid[<parity>][:<data>d][:<children>c][:<spares>s] \ <vdevs...> - draid[parity] - Parity level (default 1) - draid[:<data>d] - Data devices per group (default 8) - draid[:<children>c] - Expected number of child vdevs - draid[:<spares>s] - Distributed hot spares (default 0) Abbreviated example `zpool status` output for a 68 disk dRAID pool with two distributed spares using special allocation classes. ``` pool: tank state: ONLINE config: NAME STATE READ WRITE CKSUM slag7 ONLINE 0 0 0 draid2:8d:68c:2s-0 ONLINE 0 0 0 L0 ONLINE 0 0 0 L1 ONLINE 0 0 0 ... U25 ONLINE 0 0 0 U26 ONLINE 0 0 0 spare-53 ONLINE 0 0 0 U27 ONLINE 0 0 0 draid2-0-0 ONLINE 0 0 0 U28 ONLINE 0 0 0 U29 ONLINE 0 0 0 ... U42 ONLINE 0 0 0 U43 ONLINE 0 0 0 special mirror-1 ONLINE 0 0 0 L5 ONLINE 0 0 0 U5 ONLINE 0 0 0 mirror-2 ONLINE 0 0 0 L6 ONLINE 0 0 0 U6 ONLINE 0 0 0 spares draid2-0-0 INUSE currently in use draid2-0-1 AVAIL ``` When adding test coverage for the new dRAID vdev type the following options were added to the ztest command. These options are leverages by zloop.sh to test a wide range of dRAID configurations. -K draid|raidz|random - kind of RAID to test -D <value> - dRAID data drives per group -S <value> - dRAID distributed hot spares -R <value> - RAID parity (raidz or dRAID) The zpool_create, zpool_import, redundancy, replacement and fault test groups have all been updated provide test coverage for the dRAID feature. Co-authored-by: Isaac Huang <he.huang@intel.com> Co-authored-by: Mark Maybee <mmaybee@cray.com> Co-authored-by: Don Brady <don.brady@delphix.com> Co-authored-by: Matthew Ahrens <mahrens@delphix.com> Co-authored-by: Brian Behlendorf <behlendorf1@llnl.gov> Reviewed-by: Mark Maybee <mmaybee@cray.com> Reviewed-by: Matt Ahrens <matt@delphix.com> Reviewed-by: Tony Hutter <hutter2@llnl.gov> Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> Closes #10102
198 lines
4.6 KiB
Bash
Executable File
198 lines
4.6 KiB
Bash
Executable File
#!/bin/sh
|
|
#
|
|
# This script is designed to facilitate in-tree development and testing
|
|
# by installing symlinks on your system which refer to in-tree helper
|
|
# utilities. These helper utilities must be installed to in order to
|
|
# exercise all ZFS functionality. By using symbolic links and keeping
|
|
# the scripts in-tree during development they can be easily modified
|
|
# and those changes tracked.
|
|
#
|
|
# Use the following configuration option to override the installation
|
|
# paths for these scripts. The correct path is automatically set for
|
|
# most distributions but you can optionally set it for your environment.
|
|
#
|
|
# --with-mounthelperdir=DIR install mount.zfs in dir [/sbin]
|
|
# --with-udevdir=DIR install udev helpers [default=check]
|
|
# --with-udevruledir=DIR install udev rules [default=UDEVDIR/rules.d]
|
|
# --sysconfdir=DIR install zfs configuration files [PREFIX/etc]
|
|
#
|
|
|
|
BASE_DIR=$(dirname "$0")
|
|
SCRIPT_COMMON=common.sh
|
|
if [ -f "${BASE_DIR}/${SCRIPT_COMMON}" ]; then
|
|
. "${BASE_DIR}/${SCRIPT_COMMON}"
|
|
else
|
|
echo "Missing helper script ${SCRIPT_COMMON}" && exit 1
|
|
fi
|
|
|
|
PROG=zfs-helpers.sh
|
|
DRYRUN="no"
|
|
INSTALL="no"
|
|
REMOVE="no"
|
|
VERBOSE="no"
|
|
|
|
fail() {
|
|
echo "${PROG}: $1" >&2
|
|
exit 1
|
|
}
|
|
|
|
msg() {
|
|
if [ "$VERBOSE" = "yes" ]; then
|
|
echo "$@"
|
|
fi
|
|
}
|
|
|
|
usage() {
|
|
cat << EOF
|
|
USAGE:
|
|
$0 [dhirv]
|
|
|
|
DESCRIPTION:
|
|
Install/remove the ZFS helper utilities.
|
|
|
|
OPTIONS:
|
|
-d Dry run
|
|
-h Show this message
|
|
-i Install the helper utilities
|
|
-r Remove the helper utilities
|
|
-v Verbose
|
|
|
|
$0 -iv
|
|
$0 -r
|
|
|
|
EOF
|
|
}
|
|
|
|
while getopts 'hdirv' OPTION; do
|
|
case $OPTION in
|
|
h)
|
|
usage
|
|
exit 1
|
|
;;
|
|
d)
|
|
DRYRUN="yes"
|
|
;;
|
|
i)
|
|
INSTALL="yes"
|
|
;;
|
|
r)
|
|
REMOVE="yes"
|
|
;;
|
|
v)
|
|
VERBOSE="yes"
|
|
;;
|
|
?)
|
|
usage
|
|
exit
|
|
;;
|
|
esac
|
|
done
|
|
|
|
if [ "$INSTALL" = "yes" ] && [ "$REMOVE" = "yes" ]; then
|
|
fail "Specify -i or -r but not both"
|
|
fi
|
|
|
|
if [ "$INSTALL" = "no" ] && [ "$REMOVE" = "no" ]; then
|
|
fail "Either -i or -r must be specified"
|
|
fi
|
|
|
|
if [ "$(id -u)" != "0" ]; then
|
|
fail "Must run as root"
|
|
fi
|
|
|
|
if [ "$INTREE" != "yes" ]; then
|
|
fail "Must be run in-tree"
|
|
fi
|
|
|
|
if [ "$VERBOSE" = "yes" ]; then
|
|
echo "--- Configuration ---"
|
|
echo "udevdir: $INSTALL_UDEV_DIR"
|
|
echo "udevruledir: $INSTALL_UDEV_RULE_DIR"
|
|
echo "mounthelperdir: $INSTALL_MOUNT_HELPER_DIR"
|
|
echo "sysconfdir: $INSTALL_SYSCONF_DIR"
|
|
echo "pythonsitedir: $INSTALL_PYTHON_DIR"
|
|
echo "dryrun: $DRYRUN"
|
|
echo
|
|
fi
|
|
|
|
install() {
|
|
src=$1
|
|
dst=$2
|
|
|
|
if [ -h "$dst" ]; then
|
|
echo "Symlink exists: $dst"
|
|
elif [ -e "$dst" ]; then
|
|
echo "File exists: $dst"
|
|
elif [ ! -e "$src" ]; then
|
|
echo "Source missing: $src"
|
|
else
|
|
msg "ln -s $src $dst"
|
|
|
|
if [ "$DRYRUN" = "no" ]; then
|
|
DIR=$(dirname "$dst")
|
|
mkdir -p "$DIR" >/dev/null 2>&1
|
|
ln -s "$src" "$dst"
|
|
fi
|
|
fi
|
|
}
|
|
|
|
remove() {
|
|
dst=$1
|
|
|
|
if [ -h "$dst" ]; then
|
|
msg "rm $dst"
|
|
rm "$dst"
|
|
DIR=$(dirname "$dst")
|
|
rmdir "$DIR" >/dev/null 2>&1
|
|
elif [ -e "$dst" ]; then
|
|
echo "Expected symlink: $dst"
|
|
fi
|
|
}
|
|
|
|
if [ "${INSTALL}" = "yes" ]; then
|
|
install "$CMD_DIR/mount_zfs/mount.zfs" \
|
|
"$INSTALL_MOUNT_HELPER_DIR/mount.zfs"
|
|
install "$CMD_DIR/fsck_zfs/fsck.zfs" \
|
|
"$INSTALL_MOUNT_HELPER_DIR/fsck.zfs"
|
|
install "$CMD_DIR/zvol_id/zvol_id" \
|
|
"$INSTALL_UDEV_DIR/zvol_id"
|
|
install "$CMD_DIR/vdev_id/vdev_id" \
|
|
"$INSTALL_UDEV_DIR/vdev_id"
|
|
install "$UDEV_RULE_DIR/60-zvol.rules" \
|
|
"$INSTALL_UDEV_RULE_DIR/60-zvol.rules"
|
|
install "$UDEV_RULE_DIR/69-vdev.rules" \
|
|
"$INSTALL_UDEV_RULE_DIR/69-vdev.rules"
|
|
install "$UDEV_RULE_DIR/90-zfs.rules" \
|
|
"$INSTALL_UDEV_RULE_DIR/90-zfs.rules"
|
|
install "$CMD_DIR/zpool/zpool.d" \
|
|
"$INSTALL_SYSCONF_DIR/zfs/zpool.d"
|
|
install "$SYSCONF_DIR/zfs/draid.d" \
|
|
"$INSTALL_SYSCONF_DIR/zfs/draid.d"
|
|
install "$CONTRIB_DIR/pyzfs/libzfs_core" \
|
|
"$INSTALL_PYTHON_DIR/libzfs_core"
|
|
# Ideally we would install these in the configured ${libdir}, which is
|
|
# by default "/usr/local/lib and unfortunately not included in the
|
|
# dynamic linker search path.
|
|
install "$(find "$LIB_DIR/libzfs_core" -type f -name 'libzfs_core.so*')" \
|
|
"/lib/libzfs_core.so"
|
|
install "$(find "$LIB_DIR/libnvpair" -type f -name 'libnvpair.so*')" \
|
|
"/lib/libnvpair.so"
|
|
ldconfig
|
|
else
|
|
remove "$INSTALL_MOUNT_HELPER_DIR/mount.zfs"
|
|
remove "$INSTALL_MOUNT_HELPER_DIR/fsck.zfs"
|
|
remove "$INSTALL_UDEV_DIR/zvol_id"
|
|
remove "$INSTALL_UDEV_DIR/vdev_id"
|
|
remove "$INSTALL_UDEV_RULE_DIR/60-zvol.rules"
|
|
remove "$INSTALL_UDEV_RULE_DIR/69-vdev.rules"
|
|
remove "$INSTALL_UDEV_RULE_DIR/90-zfs.rules"
|
|
remove "$INSTALL_SYSCONF_DIR/zfs/zpool.d"
|
|
remove "$INSTALL_SYSCONF_DIR/zfs/draid.d"
|
|
remove "$INSTALL_PYTHON_DIR/libzfs_core"
|
|
remove "/lib/libzfs_core.so"
|
|
remove "/lib/libnvpair.so"
|
|
ldconfig
|
|
fi
|
|
|
|
exit 0
|