From 6e499f65f2e3ee14487c3bf8f7237ec4d988b5d1 Mon Sep 17 00:00:00 2001 From: tianzy Date: Wed, 29 Aug 2007 03:44:08 +0000 Subject: [PATCH] Branch head 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 56e9438..890ffec 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -173,6 +173,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-10 Cluster File Systems, Inc. diff --git a/lustre/tests/sanity-quota.sh b/lustre/tests/sanity-quota.sh index 73241fe..92a0080 100644 --- a/lustre/tests/sanity-quota.sh +++ b/lustre/tests/sanity-quota.sh @@ -712,8 +712,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" -- 1.8.3.1