LU-17025 llapi: restore 'pool=ignore' functionality

[fs/lustre-release.git] / lustre / tests / ost-pools.sh

diff --git a/lustre/tests/ost-pools.sh b/lustre/tests/ost-pools.sh
index e275403..12b0ff6 100755 (executable)
--- a/lustre/tests/ost-pools.sh
+++ b/lustre/tests/ost-pools.sh
@@ -1930,20 +1930,16 @@ test_32() { # LU-15707
        ( $LFS getstripe -p $DIR/$tdir | grep -q $pool ) ||
                error "fail to set pool on $DIR/$tdir"
 
-       local ig_pool="ignore_pool"
-
-       pool_add $ig_pool || error "add $ig_pool failed"
-
-       $LFS setstripe -p $ig_pool $DIR/$tdir/$tfile ||
+       $LFS setstripe -p ignore $DIR/$tdir/$tfile ||
                error "setstripe fail on $DIR/$tdir/$tfile"
 
-       ( $LFS getstripe -p $DIR/$tdir/$tfile | grep -q $ig_pool ) ||
+       ! ( $LFS getstripe -p $DIR/$tdir/$tfile | egrep -q "[^ ]+" ) ||
                error "fail to create $DIR/$tdir/$tfile without pool"
 
        # Test with start index
        local got idx
        for ((idx = 0; idx < OSTCOUNT; idx++)); do
-               $LFS setstripe -p $ig_pool -i $idx $DIR/$tdir/$tfile.$idx ||
+               $LFS setstripe -p ignore -i $idx $DIR/$tdir/$tfile.$idx ||
                        error "setstripe -i fail on $DIR/$tdir/$tfile.$idx"
 
                got=$($LFS getstripe -i $DIR/$tdir/$tfile.$idx)
@@ -1952,7 +1948,7 @@ test_32() { # LU-15707
        done
 
        # Test with ost list
-       $LFS setstripe -p $ig_pool -o 1,0 $DIR/$tdir/$tfile.1_0 ||
+       $LFS setstripe -p ignore -o 1,0 $DIR/$tdir/$tfile.1_0 ||
                error "setstripe --ost fail on $DIR/$tdir/$tfile.1_0"
 
        got=$($LFS getstripe -i $DIR/$tdir/$tfile.1_0)