Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch

This commit is contained in:
Brian Behlendorf 2009-01-08 16:57:23 -08:00
parent f837db6174 7b4f45a7fc
commit cb2148d644
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
scripts/zpios.sh
View File

@ -3,8 +3,8 @@
prog=zpios.sh prog=zpios.sh
. ../.script-config . ../.script-config
SPL_OPTIONS="spl_debug_mask=0 spl_debug_subsys=0 ${1}" SPL_OPTIONS="spl=spl_debug_mask=0 spl_debug_subsys=0 ${1}"
ZPOOL_OPTIONS=$2 ZPOOL_OPTIONS="zpool=$2"
ZPIOS_OPTIONS=$3 ZPIOS_OPTIONS=$3
PROFILE_ZPIOS_LOGS=$4 PROFILE_ZPIOS_LOGS=$4
ZPIOS_PRE=$5 ZPIOS_PRE=$5
@ -21,7 +21,7 @@ echo -n "Kernel = "; uname -r
echo ------------------------------------------------------------------------ echo ------------------------------------------------------------------------
echo echo
./load-zfs.sh "${SPL_OPTIONS}" "${ZPOOL_OPTIONS}" ./zfs.sh -v "${SPL_OPTIONS}" "${ZPOOL_OPTIONS}" || exit 1
echo ---------------------- SPL Sysctl Tunings ------------------------------ echo ---------------------- SPL Sysctl Tunings ------------------------------
sysctl -A | grep spl sysctl -A | grep spl
@ -38,10 +38,10 @@ fi
echo echo
echo "${CMDDIR}/zpool/zpool create -f lustre ${DEVICES}" echo "${CMDDIR}/zpool/zpool create -f lustre ${DEVICES}"
${CMDDIR}/zpool/zpool create -f lustre ${DEVICES} ${CMDDIR}/zpool/zpool create -f lustre ${DEVICES} || exit 1
echo "${CMDDIR}/zpool/zpool status lustre" echo "${CMDDIR}/zpool/zpool status lustre"
${CMDDIR}/zpool/zpool status lustre ${CMDDIR}/zpool/zpool status lustre || exit 1
echo "Waiting for /dev/zpios to come up..." echo "Waiting for /dev/zpios to come up..."
while [ ! -c /dev/zpios ]; do while [ ! -c /dev/zpios ]; do
@ -49,7 +49,7 @@ while [ ! -c /dev/zpios ]; do
done done
if [ -n "${ZPIOS_PRE}" ]; then if [ -n "${ZPIOS_PRE}" ]; then
${ZPIOS_PRE} ${ZPIOS_PRE} || exit 1
fi fi
# Usage: zpios # Usage: zpios
@ -106,11 +106,11 @@ CMD="${CMDDIR}/zpios/zpios \
echo echo
date date
echo ${CMD} echo ${CMD}
$CMD $CMD || exit 1
date date
if [ -n "${ZPIOS_POST}" ]; then if [ -n "${ZPIOS_POST}" ]; then
${ZPIOS_POST} ${ZPIOS_POST} || exit 1
fi fi
${CMDDIR}/zpool/zpool destroy lustre ${CMDDIR}/zpool/zpool destroy lustre
@ -130,4 +130,6 @@ echo SLAB
cat /proc/spl/kmem/slab cat /proc/spl/kmem/slab
echo echo
./unload-zfs.sh ./zfs.sh -vu || exit 1
exit 0