X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre-iokit%2Fobdfilter-survey%2Flibecho;h=e12c853c8c65bdb7e6a652bd7d9bc2cf8190ad9b;hb=f6d84d790c63bc200f8f25ac40b3f72321f62190;hp=9bca4b899af685481893b5dfe11d561e5e70286a;hpb=001bef3fa9e0d5cf56771de20ae48e96bea0852f;p=fs%2Flustre-release.git

diff --git a/lustre-iokit/obdfilter-survey/libecho b/lustre-iokit/obdfilter-survey/libecho
index 9bca4b8..e12c853 100644
--- a/lustre-iokit/obdfilter-survey/libecho
+++ b/lustre-iokit/obdfilter-survey/libecho
@@ -1,19 +1,36 @@
 #!/bin/bash
-#*  Copyright (C) 2002 Cluster File Systems, Inc.
-#*   Author: Jitendra Pawar <jitendra@clusterfs.com>
-#*
-#*   Lustre-iokit is free software; you can redistribute it and/or
-#*   modify it under the terms of version 2 of the GNU General Public
-#*   License as published by the Free Software Foundation.
-#*
-#*   Lustre-iokit is distributed in the hope that it will be useful,
-#*   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#*   GNU General Public License for more details.
-#*
-#*   You should have received a copy of the GNU General Public License
-#*   along with Lustre; if not, write to the Free Software
-#*   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# GPL HEADER START
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 only,
+# as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License version 2 for more details (a copy is included
+# in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU General Public License
+# version 2 along with this program; If not, see
+# http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
+#
+# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+#
+# GPL HEADER END
+#
+# Copyright  2008 Sun Microsystems, Inc. All rights reserved
+# Use is subject to license terms.
+#
+# This file is part of Lustre, http://www.lustre.org/
+# Lustre is a trademark of Sun Microsystems, Inc.
+#
+# Author: Jitendra Pawar <jitendra@clusterfs.com>
+
 
 # binaries
 lsmod="/sbin/lsmod"
@@ -22,6 +39,7 @@ insmod="/sbin/insmod"
 rmmod="/sbin/rmmod"
 
 declare -a ost_names
+declare -a client_names
 declare -a host_list
 declare -a dev_list
 declare -a unique_hosts
@@ -31,6 +49,7 @@ declare -a do_unload_echo
 
 
 DSH=${DSH:-"ssh"}
+NETTYPE=${NETTYPE:-tcp}
 
 dsh () {
     local node="$1"
@@ -38,9 +57,7 @@ dsh () {
     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)
@@ -155,10 +172,44 @@ get_devnos () {
     return 0
 }
 
+# do cleanup for netdisk case.
+cleanup_netdisk () {
+    for osc in $@; do
+        $lctl <<EOF
+        cfg_device $osc 
+        cleanup
+        detach
+EOF
+    done
+}
+
+# do cleanup for network case.
+cleanup_network () {
+    local clean_srv_OSS=$1
+    $lctl <<EOF
+    cfg_device echotmp 
+    cleanup
+    detach
+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
+            cfg_device OSS
+            cleanup
+            detach
+EOF"
+    fi
+}
+
 # do cleanup and exit.
 cleanup () {
-    local clean_srv_OSS=$2
-    for ((i = 0; i < ndevs; i++)); do
+    local exit_status=$1
+    shift
+    for ((i = 0; i < $ndevs; i++)); do
     	host=${host_names[$i]}
 	    if [ -n ${do_teardown_ec[$i]} ]; then
         	teardown_ec_devno $host ${client_names[$i]}
@@ -177,26 +228,14 @@ cleanup () {
         fi
     done
     if [ $case == "network" ]; then
-        lctl <<EOF
-        cfg_device osc_testfs
-        cleanup
-        detach
-EOF
-        remote_shell "root@$server_nid" "lctl << EOF
-            cfg_device echo_srv
-            cleanup
-            detach
-EOF"
+        cleanup_network $1 
     fi
-    if [ $clean_srv_OSS ]; then
-        remote_shell "root@$server_nid" "lctl << EOF
-            cfg_device OSS
-            cleanup
-            detach
-EOF"
+    if [ $case == "netdisk" ]; then
+	shift
+        cleanup_netdisk $@
     fi
-    if [ $1 ]; then
-        if [ $1 -ne 0 ]; then
+    if [ $exit_status ]; then
+        if [ $exit_status -ne 0 ]; then
             echo "program exited with error "
         else
             echo "done!"
@@ -204,60 +243,65 @@ EOF"
     else
         echo "Terminated"
     fi
-    exit $1
+    exit $exit_status
 }
 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}_echo_client
+        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
         attach echo_client $client_name ${client_name}_UUID
 	setup $ost_name
 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
 # It creates echoclients for all osc listed using #lctl device_list command
 ec_using_osc () {
     local osc_name=$1
-    local osc_uuid=$2
     $lctl <<EOF
-        attach echo_client ECHO_$osc_name $osc_uuid
-        cfg_device ECHO_$osc_name
+        attach echo_client ${osc_name}_ecc ${osc_name}_ecc_UUID
+        cfg_device ${osc_name}_ecc
         setup $osc_name
 EOF
 
@@ -268,18 +312,30 @@ ec_using_srv_nid () {
     local server_nid=$1
     local ocsname=$2
     local oscuuid=$3
-    $lctl add_uuid testfs_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
-        setup echo_srv_UUID testfs_UUID
+        setup echo_srv_UUID echo_UUID
 EOF
     $lctl <<EOF
-        attach echo_client ECHO_$ocsname $oscuuid
+        attach echo_client ${ocsname}_ecc $oscuuid
         setup $ocsname 
 EOF
 }
 
+setup_osc_for_remote_ost () {
+    local ost_nid=$1
+    local obdfilter_name=$2
+    local host_name=host_$3
+    $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 
+        setup ${obdfilter_name}_UUID ${host_name}_UUID
+EOF
+}
+
 # setup obdecho on server
 setup_srv_obd () {
     local server_nid=$1
@@ -332,7 +388,7 @@ split_hostname () {
 
 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))
@@ -347,7 +403,7 @@ check_cleanup () {
 
 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))
@@ -363,16 +419,18 @@ check_setup () {
 # added from bugzill req.
 get_targets () {
     if [ -z "$ost_names" ]; then
-        OSTS=$($lctl device_list | awk "{if (\$2 == \"UP\" && \
+        targets=$($lctl device_list | awk "{if (\$2 == \"UP\" && \
             \$3 == \"obdfilter\") {print \$4} }")
     fi
-    if [ -z "$OSTS" ]; then
-        echo "Can't find any OSTs to test.  Please set ost_names=..."
+    if [ -z "$targets" ]; then
+        echo "Can't find any OSTs to test.  Please set targets=..."
         exit 1
     fi
     count=0
-    for name in $OSTS; do
+    for name in $targets; do
         ost_names[$count]=$name
+        str=(`split_hostname $name`)
+        host_names[$count]=${str[0]}
         count=$((count+1))
     done
 }
@@ -380,7 +438,7 @@ get_targets () {
 get_hosts () {
     # split out hostnames from ost names
     for ((i = 0; i < count; i++)); do
-        str=(`split_hostname ${OSTS[$i]}`)
+        str=(`split_hostname ${targets[$i]}`)
         host_list[$i]=${str[0]}
         ost_names[$i]=${str[1]}
     done