[ -d /r ] && R=/r
PORTALS=$SRCDIR../../portals
-LUSTRE=$SRCDIR../../obd
+LUSTRE=$SRCDIR../../lustre
PTLCTL=$PORTALS/linux/utils/ptlctl
DBGCTL=$PORTALS/linux/utils/debugctl
BASE=`echo $MODULE | sed -e "s^.*/^^" -e "s/\.o$//"`
[ "$MODULE" ] || fail "usage: $0 <module>"
- [ -f $MODULE ] || fail "$0: module '$MODULE' not found"
- lsmod | grep -q "\<$BASE\>" && return 1
- insmod $MODULE || exit -1
+ [ -f $MODULE ] || echo "$0: module '$MODULE' not found" 1>&2
+ lsmod | grep -q "\<$BASE\>" && return 0
+ insmod $MODULE
}
# Return the next unused loop device on stdout and in the $LOOPDEV
# filesystem on a device we use mkfs, because that only writes sparsely
# to the device. The empty filesystems are also highly compressed (1000:1)
# so they don't take too much space.
+#
+new_fs_usage() {
+ echo "new_fs <fstype> {device | file} [size]" 1>&2
+ exit -1
+}
new_fs () {
EFILE="$1_$3.gz"
MKFS="mkfs.$1"
[ "$1" = "ext3" ] && MKFS="mkfs.ext2 -j"
if [ "$1" = "extN" ]; then
MKFS="mkfs.ext2 -j"
- EFILE="$1_ext3.gz"
- do_insmod $LUSTRE/extN/extN.o
+ EFILE="ext3_$3.gz"
fi
if [ -b "$2" ]; then
- [ $# -lt 2 -o $# -gt 3 ] && \
- echo "usage: $0 <fstype> <file> [size]" 1>&2 && exit -1
+ [ $# -lt 2 -o $# -gt 3 ] && new_fs_usage
PM="/proc/mounts"
[ -r "$PM" ] || PM="/etc/mtab"
$MKFS $MKFSOPT $2 $3 || exit -1
LOOPDEV=$2 # Not really a loop device
else
- [ $# -ne 3 ] && \
- echo "usage: $0 <fstype> <file> <size>" 1>&2 && exit -1
+ [ $# -ne 3 ] && new_fs_usage
if [ -r "$EFILE" ]; then
echo "using prepared filesystem $EFILE for $2"
LOOPDEV=`next_loop_dev`
losetup ${LOOPDEV} $2 1>&2 || exit -1
fi
+
+ # Enable hash-indexed directories for extN filesystems
+ [ "$1" = "extN" ] && echo "feature FEATURE_C5" | debugfs -w $2
}
# Set up to use an existing filesystem. We take the same parameters as
old_fs () {
[ -e $2 ] || exit -1
- [ "$1" = "extN" ] && do_insmod $LUSTRE/extN/extN.o
-
if [ -b "$2" ]; then
LOOPDEV=$2 # Not really a loop device
else
fi
[ -z "$OSTNODE" ] && OSTNODE=$SERVER
+ [ -z "$MDSNODE" ] && MDSNODE=$SERVER
if [ -z "$DLM" ]; then
if [ "$LOCALHOST" == "$SERVER" ]; then
[ -c /dev/portals ] || mknod /dev/portals c 10 240
- do_insmod $PORTALS/linux/oslib/portals.o
+ do_insmod $PORTALS/linux/oslib/portals.o || exit -1
case $NETWORK in
elan) [ "$PORT" ] && fail "$0: NETWORK is elan but PORT is set"
- do_insmod $PORTALS/linux/qswnal/kqswnal.o
+ do_insmod $PORTALS/linux/qswnal/kqswnal.o || exit -1
;;
tcp) [ "$PORT" ] || fail "$0: NETWORK is tcp but PORT is not set"
- do_insmod $PORTALS/linux/socknal/ksocknal.o
+ do_insmod $PORTALS/linux/socknal/ksocknal.o || exit -1
$ACCEPTOR $PORT
;;
*) fail "$0: unknown NETWORK '$NETWORK'" ;;
$PTLCTL <<- EOF
setup $NETWORK
mynid $LOCALHOST
- connect $SERVER $PORT
- add_uuid self
- add_uuid mds
+ connect $MDSNODE $PORT
+ add_uuid $MDSNODE
connect $OSTNODE $PORT
- add_uuid ost
+ add_uuid $OSTNODE
connect $DLM $PORT
- add_uuid ldlm
+ add_uuid $DLM
+ add_uuid self
quit
EOF
}
setup_lustre() {
[ -c /dev/obd ] || mknod /dev/obd c 10 241
- do_insmod $LUSTRE/class/obdclass.o
- do_insmod $LUSTRE/rpc/ptlrpc.o
- do_insmod $LUSTRE/ldlm/ldlm.o
- do_insmod $LUSTRE/extN/extN.o
- do_insmod $LUSTRE/mds/mds.o
- do_insmod $LUSTRE/obdecho/obdecho.o
- do_insmod $LUSTRE/ext2obd/obdext2.o
- do_insmod $LUSTRE/filterobd/obdfilter.o
- do_insmod $LUSTRE/ost/ost.o
- do_insmod $LUSTRE/osc/osc.o
- do_insmod $LUSTRE/mdc/mdc.o
- do_insmod $LUSTRE/llight/llite.o
-
+ do_insmod $LUSTRE/obdclass/obdclass.o || exit -1
+ do_insmod $LUSTRE/ptlrpc/ptlrpc.o || exit -1
+ do_insmod $LUSTRE/ldlm/ldlm.o || exit -1
+ do_insmod $LUSTRE/extN/extN.o || \
+ echo "info: can't load extN.o module, not fatal if using ext3"
+ do_insmod $LUSTRE/mds/mds.o || exit -1
+ #do_insmod $LUSTRE/mds/mds_ext2.o || exit -1
+ #do_insmod $LUSTRE/mds/mds_ext3.o || exit -1
+ do_insmod $LUSTRE/mds/mds_extN.o || \
+ echo "info: can't load mds_extN.o module, needs extN.o"
+ do_insmod $LUSTRE/obdecho/obdecho.o || exit -1
+ #do_insmod $LUSTRE/obdext2/obdext2.o || exit -1
+ do_insmod $LUSTRE/obdfilter/obdfilter.o || exit -1
+ do_insmod $LUSTRE/ost/ost.o || exit -1
+ do_insmod $LUSTRE/osc/osc.o || exit -1
+ do_insmod $LUSTRE/mdc/mdc.o || exit -1
+ do_insmod $LUSTRE/llite/llite.o || exit -1
+
+ echo "$R/tmp/lustre-log" > /proc/sys/portals/debug_path
list_mods
if $OBDCTL name2dev RPCDEV > /dev/null 2>&1; then
return 0
fi
- $OBDCTL <<- EOF || return $rc
+ $OBDCTL <<- EOF || return $?
newdev
attach ptlrpc RPCDEV
setup
[ -c /dev/portals ] || mknod /dev/portals c 10 240
- $OBDCTL <<- EOF || return $rc
+ $OBDCTL <<- EOF || return $?
newdev
attach ldlm LDLMDEV
setup
$DO_FS ${MDSFS} ${MDSDEV} ${MDSSIZE}
MDS=${LOOPDEV}
- $OBDCTL <<- EOF || return $rc
+ $OBDCTL <<- EOF || return $?
newdev
attach mds MDSDEV
setup ${MDS} ${MDSFS}
OBD=${LOOPDEV}
fi
- $OBDCTL <<- EOF || return $rc
+ $OBDCTL <<- EOF || return $?
newdev
attach ${OSTTYPE} OBDDEV
setup ${OBD} ${OBDARG}
+ quit
+ EOF
+ $OBDCTL <<- EOF || return $?
newdev
attach ost OSTDEV
setup \$OBDDEV
}
setup_osc() {
+ set -vx
[ "$SETUP_OSC" != "y" ] && return 0
+ [ "$OSC_NAMES" ] || OSC_NAMES=OSCDEV
- if $OBDCTL name2dev OSCDEV > /dev/null 2>&1; then
+ for THEOSC in $OSC_NAMES ; do
+ OSCDEVNO=`find_devno $THEOSC`
+ if $OBDCTL name2dev $THEOSC > /dev/null 2>&1; then
echo "$0: OSCDEV is already configured"
return 0
- fi
+ fi
$OBDCTL <<- EOF || return $rc
newdev
- attach osc OSCDEV
- setup -1
+ attach osc $THEOSC
+ setup OSTDEV $OSTNODE
quit
EOF
+ done
}
+setup_mdc() {
+ set -vx
+ [ "$SETUP_MDC" != "y" ] && return 0
+ [ "$MDC_NAMES" ] || MDC_NAMES=MDCDEV
+
+ for THEMDC in $MDC_NAMES ; do
+ MDCDEVNO=`find_devno $THEMDC`
+ if $OBDCTL name2dev $THEMDC > /dev/null 2>&1; then
+ echo "$0: MDCDEV is already configured"
+ return 0
+ fi
+
+ $OBDCTL <<- EOF || return $?
+ newdev
+ attach mdc $THEMDC
+ setup MDSDEV $MDSNODE
+ quit
+ EOF
+ done
+}
+
+
setup_mount() {
+ set -vx
[ "$SETUP_MOUNT" != "y" ] && return 0
+ [ "$MDC_NAMES" ] || MDC_NAMES=MDCDEV
+ [ "$OSC_NAMES" ] || OSC_NAMES=OSCDEV
+ [ -z "$MOUNT_LIST" -a "$OSCMT" ] && MOUNT_LIST="MT" && MT="$OSCMT OSCDEV MDCDEV"
- [ "$OSCMT" ] || fail "error: $0: OSCMT unset"
+ [ "$MOUNT_LIST" ] || fail "error: $0: MOUNT_LIST unset"
- if mount | grep -q $OSCMT; then
- echo "$0: $OSCMT is already mounted"
- return 0
- fi
+ for THEMOUNT in $MOUNT_LIST; do
+ eval "echo \$$THEMOUNT" | while read MTPT THEOSC THEMDC; do
+ if mount | grep -q $MTPT; then
+ echo "$0: $MTPT is already mounted"
+ return 0
+ fi
- [ ! -d $OSCMT ] && mkdir $OSCMT
- mount -t lustre_lite -o device=`find_devno OSCDEV` none $OSCMT
+ [ ! -d $MTPT ] && mkdir $MTPT
+ echo mount -t lustre_lite -o ost=`find_devno $THEOSC`,mds=`find_devno $THEMDC` none $MTPT
+ mount -t lustre_lite -o ost=`find_devno $THEOSC`,mds=`find_devno $THEMDC` none $MTPT
+ done
+ done
}
setup_client() {
- setup_osc && setup_mount
+ setup_osc && setup_mdc && setup_mount
}
DEBUG_ON="echo 0xffffffff > /proc/sys/portals/debug"
}
cleanup_portals() {
+ [ -z "$NETWORK" ] && NETWORK=tcp
$PTLCTL <<- EOF
- setup tcp
+ setup $NETWORK
disconnect
del_uuid self
- del_uuid mds
- del_uuid ost
- del_uuid ldlm
+ del_uuid $MDSNODE
+ del_uuid $OSTNODE
+ del_uuid $DLM
quit
EOF
rmmod llite
rmmod mdc
+ rmmod mds_extN
+ rmmod mds_ext3
+ rmmod mds_ext2
rmmod mds
rmmod ost
rmmod osc
[ "$SETUP" -a -z "$SETUP_MOUNT" ] && return 0
[ "$OSCMT" ] || OSCMT=/mnt/lustre
- if [ "`mount | grep $OSCMT`" ]; then
- umount $OSCMT || fail "unable to unmount $OSCMT"
- fi
+ for THEMOUNT in $OSCMT; do
+ if [ "`mount | grep $THEMOUNT`" ]; then
+ umount $THEMOUNT || fail "unable to unmount $THEMOUNT"
+ fi
+ done
}
cleanup_osc() {
[ "$SETUP" -a -z "$SETUP_OSC" ] && return 0
+ [ "$OSC_NAMES" ] || OSC_NAMES=OSCDEV
- OSCDEVNO=`find_devno OSCDEV`
- if [ "$OSCDEVNO" ]; then
+ for THEOSC in $OSC_NAMES ; do
+ OSCDEVNO=`find_devno $THEOSC`
+ if [ "$OSCDEVNO" ]; then
$OBDCTL <<- EOF
device $OSCDEVNO
cleanup
detach
quit
EOF
- fi
+ fi
+ done
+}
+
+cleanup_mdc() {
+ [ "$SETUP" -a -z "$SETUP_MDC" ] && return 0
+ [ "$MDC_NAMES" ] || MDC_NAMES=MDCDEV
+
+ for THEMDC in $MDC_NAMES ; do
+ MDCDEVNO=`find_devno $THEMDC`
+ if [ "$MDCDEVNO" ]; then
+ $OBDCTL <<- EOF
+ device $MDCDEVNO
+ cleanup
+ detach
+ quit
+ EOF
+ fi
+ done
}
cleanup_rpc() {
}
cleanup_client() {
- cleanup_mount && cleanup_osc && cleanup_rpc
+ cleanup_mount && cleanup_osc && cleanup_mdc && cleanup_rpc
}
fail() {
git://git.whamcloud.com / fs / lustre-release.git / blobdiff