From c1148c99684ce0504acdd2d8dcd4889381b60434 Mon Sep 17 00:00:00 2001
From: bwzhou <bwzhou>
Date: Wed, 31 Oct 2007 03:15:49 +0000
Subject: [PATCH] Branch b1_6 b=13720 i=johann

Use the pathname of l_getgroups on MDS to set mdt.group_upcall
---
 lustre/tests/cfg/insanity-local.sh | 10 +++++-----
 lustre/tests/cfg/local.sh          |  8 +++++---
 lustre/tests/cfg/lov.sh            |  8 +++++---
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/lustre/tests/cfg/insanity-local.sh b/lustre/tests/cfg/insanity-local.sh
index d832159852..f728abf985 100644
--- a/lustre/tests/cfg/insanity-local.sh
+++ b/lustre/tests/cfg/insanity-local.sh
@@ -8,6 +8,7 @@ ost_HOST=${ost_HOST:-`hostname`}
 LIVE_CLIENT=${LIVE_CLIENT:-`hostname`}
 # This should always be a list, not a regexp
 FAIL_CLIENTS=${FAIL_CLIENTS:-""}
+PDSH=${PDSH:-no_dsh}
 
 TMP=${TMP:-/tmp}
 MDSDEV=${MDSDEV:-$TMP/${FSNAME}-mdt}
@@ -27,6 +28,8 @@ TIMEOUT=${TIMEOUT:-30}
 PTLDEBUG=${PTLDEBUG:-0x33f0404}
 SUBSYSTEM=${SUBSYSTEM:- 0xffb7e3ff}
 
+L_GETGROUPS=${L_GETGROUPS:-`do_facet mds which l_getgroups || echo`}
+
 MKFSOPT=""
 MOUNTOPT=""
 [ "x$MDSJOURNALSIZE" != "x" ] &&
@@ -41,8 +44,8 @@ MOUNTOPT=""
     MOUNTOPT=$MOUNTOPT" --param lov.stripesize=$STRIPE_BYTES"
 [ "x$STRIPES_PER_OBJ" != "x" ] &&
     MOUNTOPT=$MOUNTOPT" --param lov.stripecount=$STRIPES_PER_OBJ"
-[ "x$LUSTRE" != "x" ] && [ -f $LUSTRE/utils/l_getgroups ] &&
-    MOUNTOPT=$MOUNTOPT"  --param mdt.group_upcall=$LUSTRE/utils/l_getgroups" 
+[ "x$L_GETGROUPS" != "x" ] &&
+    MOUNTOPT=$MOUNTOPT" --param mdt.group_upcall=$L_GETGROUPS"
 MDS_MKFS_OPTS="--mgs --mdt --fsname=$FSNAME --device-size=$MDSSIZE --param sys.timeout=$TIMEOUT $MKFSOPT $MOUNTOPT $MDSOPT"
 
 MKFSOPT=""
@@ -59,9 +62,6 @@ MDS_MOUNT_OPTS="-o loop"
 OST_MOUNT_OPTS="-o loop"
 MOUNT=${MOUNT:-"/mnt/lustre"}
 
-PDSH=${PDSH:-no_dsh}
 FAILURE_MODE=${FAILURE_MODE:-SOFT} # or HARD
 POWER_DOWN=${POWER_DOWN:-"powerman --off"}
 POWER_UP=${POWER_UP:-"powerman --on"}
-
-PDSH=${PDSH:-no_dsh}
diff --git a/lustre/tests/cfg/local.sh b/lustre/tests/cfg/local.sh
index bb678a217a..48c00a25bb 100644
--- a/lustre/tests/cfg/local.sh
+++ b/lustre/tests/cfg/local.sh
@@ -6,6 +6,7 @@ mdsfailover_HOST=${mdsfailover_HOST}
 mgs_HOST=${mgs_HOST:-$mds_HOST}
 ost_HOST=${ost_HOST:-`hostname`}
 ostfailover_HOST=${ostfailover_HOST}
+PDSH=${PDSH:-no_dsh}
 
 TMP=${TMP:-/tmp}
 
@@ -31,6 +32,8 @@ TIMEOUT=${TIMEOUT:-20}
 PTLDEBUG=${PTLDEBUG:-0x33f1504}
 SUBSYSTEM=${SUBSYSTEM:- 0xffb7e3ff}
 
+L_GETGROUPS=${L_GETGROUPS:-`do_facet mds which l_getgroups || echo`}
+
 MKFSOPT=""
 MOUNTOPT=""
 [ "x$MDSJOURNALSIZE" != "x" ] &&
@@ -45,8 +48,8 @@ MOUNTOPT=""
     MOUNTOPT=$MOUNTOPT" --param lov.stripesize=$STRIPE_BYTES"
 [ "x$STRIPES_PER_OBJ" != "x" ] &&
     MOUNTOPT=$MOUNTOPT" --param lov.stripecount=$STRIPES_PER_OBJ"
-[ "x$LUSTRE" != "x" ] && [ -f $LUSTRE/utils/l_getgroups ] &&
-    MOUNTOPT=$MOUNTOPT" --param mdt.group_upcall=$LUSTRE/utils/l_getgroups"
+[ "x$L_GETGROUPS" != "x" ] &&
+    MOUNTOPT=$MOUNTOPT" --param mdt.group_upcall=$L_GETGROUPS"
 MDS_MKFS_OPTS="--mgs --mdt --fsname=$FSNAME --device-size=$MDSSIZE --param sys.timeout=$TIMEOUT $MKFSOPT $MOUNTOPT $MDSOPT"
 
 MKFSOPT=""
@@ -71,7 +74,6 @@ DIR=${DIR:-$MOUNT}
 DIR1=${DIR:-$MOUNT1}
 DIR2=${DIR2:-$MOUNT2}
 
-PDSH=${PDSH:-no_dsh}
 FAILURE_MODE=${FAILURE_MODE:-SOFT} # or HARD
 POWER_DOWN=${POWER_DOWN:-"powerman --off"}
 POWER_UP=${POWER_UP:-"powerman --on"}
diff --git a/lustre/tests/cfg/lov.sh b/lustre/tests/cfg/lov.sh
index d0ee6f2fc2..7b0e427119 100644
--- a/lustre/tests/cfg/lov.sh
+++ b/lustre/tests/cfg/lov.sh
@@ -6,6 +6,7 @@ mdsfailover_HOST=${mdsfailover_HOST}
 mgs_HOST=${mgs_HOST:-$mds_HOST}
 ost_HOST=${ost_HOST:-`hostname`}
 ostfailover_HOST=${ostfailover_HOST}
+PDSH=${PDSH:-no_dsh}
 
 TMP=${TMP:-/tmp}
 MDSDEV=${MDSDEV:-$TMP/${FSNAME}-mdt}
@@ -25,6 +26,8 @@ TIMEOUT=${TIMEOUT:-20}
 PTLDEBUG=${PTLDEBUG:-0x33f0404}
 SUBSYSTEM=${SUBSYSTEM:- 0xffb7e3ff}
 
+L_GETGROUPS=${L_GETGROUPS:-`do_facet mds which l_getgroups || echo`}
+
 MKFSOPT=""
 MOUNTOPT=""
 [ "x$MDSJOURNALSIZE" != "x" ] &&
@@ -39,8 +42,8 @@ MOUNTOPT=""
     MOUNTOPT=$MOUNTOPT" --param lov.stripesize=$STRIPE_BYTES"
 [ "x$STRIPES_PER_OBJ" != "x" ] &&
     MOUNTOPT=$MOUNTOPT" --param lov.stripecount=$STRIPES_PER_OBJ"
-[ "x$LUSTRE" != "x" ] && [ -f $LUSTRE/utils/l_getgroups ] &&
-    MOUNTOPT=$MOUNTOPT" --param mdt.group_upcall=$LUSTRE/utils/l_getgroups"
+[ "x$L_GETGROUPS" != "x" ] &&
+    MOUNTOPT=$MOUNTOPT" --param mdt.group_upcall=$L_GETGROUPS"
 MDS_MKFS_OPTS="--mgs --mdt --fsname=$FSNAME --device-size=$MDSSIZE --param sys.timeout=$TIMEOUT $MKFSOPT $MOUNTOPT $MDSOPT"
 
 MKFSOPT=""
@@ -65,7 +68,6 @@ DIR=${DIR:-$MOUNT}
 DIR1=${DIR:-$MOUNT1}
 DIR2=${DIR2:-$MOUNT2}
 
-PDSH=${PDSH:-no_dsh}
 FAILURE_MODE=${FAILURE_MODE:-SOFT} # or HARD
 POWER_DOWN=${POWER_DOWN:-"powerman --off"}
 POWER_UP=${POWER_UP:-"powerman --on"}
-- 
GitLab