From 4e4edce5b732b5c1ce884a92710271edb2d1895f Mon Sep 17 00:00:00 2001
From: tianzy <tianzy>
Date: Wed, 29 Aug 2007 03:42:16 +0000
Subject: [PATCH] Branch b1_6 test_7 on sanity-quota.sh can't be used on
separate machines, add facet to handle it b=13363
---
lustre/ChangeLog | 5 +++++
lustre/tests/sanity-quota.sh | 4 ++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 657b9dbe51..350ebb4280 100644
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -110,6 +110,11 @@ Bugzilla : 13360
Description: Build failure against Centos5 (RHEL5)
Details : Define PAGE_SIZE when it isn't present.
+Severity : minor
+Bugzilla : 13363
+Description: test_7 on sanity-quota.sh can't be used on separate machines
+Details : add facet to handle it
+
--------------------------------------------------------------------------------
2007-08-27 Cluster File Systems, Inc. <info@clusterfs.com>
diff --git a/lustre/tests/sanity-quota.sh b/lustre/tests/sanity-quota.sh
index 780219f5ab..bccee987df 100644
--- a/lustre/tests/sanity-quota.sh
+++ b/lustre/tests/sanity-quota.sh
@@ -722,8 +722,8 @@ test_7()
[ $TOTAL_LIMIT -eq $LIMIT ] || error "total limits not recovery!"
echo " total limits = $TOTAL_LIMIT"
- OST0_UUID=`$LCTL dl | awk '$3 ~ /obdfilter/ { print $5 }'| head -n1`
- [ -z "$OST0_UUID" ] && OST0_UUID=`$LCTL dl | awk '$3 ~ /obdfilter/ { print $5 }'|head -n1`
+ OST0_UUID=`do_facet ost1 "$LCTL dl | grep -m1 obdfilter" | awk '{print $((NF-1))}'`
+ [ -z "$OST0_UUID" ] && OST0_UUID=`do_facet ost1 "$LCTL dl | grep -m1 obdfilter" | awk '{print $((NF-1))}'`
OST0_LIMIT="`$LFS quota -o $OST0_UUID -u $TSTUSR $MOUNT | awk '/^.*[[:digit:]+][[:space:]+]/ { print $3 }'`"
[ $OST0_LIMIT -eq $BUNIT_SZ ] || error "high limits not released!"
echo " limits on $OST0_UUID = $OST0_LIMIT"
--
GitLab