DSH=${DSH:-"ssh"}
+NETTYPE=${NETTYPE:-tcp}
dsh () {
local node="$1"
shift 2
local command="$@"
- local here=$(pwd)
-
- command="cd $here; export PATH=/sbin:/usr/sbin:\$PATH; $command"
+ command="export PATH=/sbin:/usr/sbin:\$PATH; $command"
case $DSH in
ssh)
# do cleanup for netdisk case.
cleanup_netdisk () {
for osc in $@; do
- lctl <<EOF
+ $lctl <<EOF
cfg_device $osc
cleanup
detach
# do cleanup for network case.
cleanup_network () {
local clean_srv_OSS=$1
- lctl <<EOF
+ $lctl <<EOF
cfg_device echotmp
cleanup
detach
EOF
- remote_shell "root@$server_nid" "lctl << EOF
+ remote_shell "root@$server_nid" "$lctl << EOF
cfg_device echo_srv
cleanup
detach
EOF"
if [ $clean_srv_OSS ]; then
- remote_shell "root@$server_nid" "lctl << EOF
+ remote_shell "root@$server_nid" "$lctl << EOF
cfg_device OSS
cleanup
detach
}
trap cleanup SIGHUP SIGINT SIGTERM
-# gets echoclient device number and attch it to the client UUID
-#
+# gets echoclient device number and attach it to the client UUID
+# Results are returned by an echo followed by an exit
+# This must run in a subshell.
+#
# parameter: 1. hostname
# 2. client name, ex:- ns8:ECHO_ns8
# 3. name of ost instances, ex:- lustre-OST0001
get_ec_devno () {
+ exec 8>&1 1>&2
local host=$1
local client_name="$2"
local ost_name="$3"
if [ -z "$client_name" ]; then
if [ -z "$ost_name" ]; then
- echo "client and ost name both null" 1>&2
- return
+ echo "client and ost name both null"
+ exit 1
fi
client_name=${ost_name}_ecc
fi
ec=`get_devno $host echo_client $client_name`
if [ -n "$ec" ]; then
- echo $ec $client_name $client_name
- return
+ echo $ec $client_name $client_name >&8
+ exit 0
fi
if [ -z "$ost_name" ]; then
- echo "no echo client and ost_name not set, client: $client_name, host: $host" 1>&2
- return
+ echo "no echo client and ost_name not set, client:" \
+ "$client_name, host: $host"
+ exit 1
fi
ost=`get_devno $host obdfilter $ost_name`
if [ -z "$ost" ]; then
- echo "OST $ost_name not setup" 1>&2
- return
+ echo "OST $ost_name not setup"
+ exit 1
fi
client_name=${ost_name}_ecc
remote_shell $host "$lctl <<EOF
EOF"
ec=`get_devno $host echo_client $client_name`
if [ -z "$ec" ]; then
- echo "Can't setup echo-client" 1>&2
- return
+ echo "Can't setup echo-client"
+ exit 1
fi
- echo $ec $client_name 1
+ echo $ec $client_name 1 >&8
+ exit 0
}
# Create echo-clients using osc_names and osc_uuid
local server_nid=$1
local ocsname=$2
local oscuuid=$3
- $lctl add_uuid echo_UUID $server_nid@tcp >/dev/null 2>&1
+ $lctl add_uuid echo_UUID $server_nid@$NETTYPE >/dev/null 2>&1
$lctl <<EOF
attach osc $ocsname $oscuuid
cfg_device $ocsname
local ost_nid=$1
local obdfilter_name=$2
local host_name=host_$3
- $lctl add_uuid ${host_name}_UUID $ost_nid@tcp >/dev/null 2>&1
+ $lctl add_uuid ${host_name}_UUID $ost_nid@$NETTYPE >/dev/null 2>&1
$lctl <<EOF
attach osc ${obdfilter_name}_osc ${obdfilter_name}_osc_UUID
cfg_device ${obdfilter_name}_osc
check_cleanup () {
type_obj="$1"
- osc_names_str=$(lctl dl | grep $type_obj)
+ osc_names_str=$($lctl dl | grep $type_obj)
count=0;
for name in $osc_names_str; do
count=$((count+1))
check_setup () {
type_obj="$1"
- osc_names_str=$(lctl dl | grep $type_obj)
+ osc_names_str=$($lctl dl | grep $type_obj)
count=0;
for name in $osc_names_str; do
count=$((count+1))