LU-1154 clio: rename coo_attr_set to coo_attr_update

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

diff --git a/lustre/tests/ost-pools.sh b/lustre/tests/ost-pools.sh
index dd13c6b..865f62f 100644 (file)
--- a/lustre/tests/ost-pools.sh
+++ b/lustre/tests/ost-pools.sh
@@ -155,15 +155,15 @@ check_file_not_in_pool() {
 }
 
 check_dir_not_in_pool() {
-    local dir=$1
-    local pool=$2
-    local res=$($GETSTRIPE -v $dir | grep "^stripe_count" | head -1 |
-                cut -f 8 -d ' ')
-    if [[ "$res" == "$pool" ]]; then
-        error "File $dir is in pool: $res"
-        return 1
-    fi
-    return 0
+       local dir=$1
+       local pool=$2
+       local res=$($GETSTRIPE -v $dir | grep "^stripe_count" | head -n1 |
+               cut -f 8 -d ' ')
+       if [[ "$res" == "$pool" ]]; then
+               error "File $dir is in pool: $res"
+               return 1
+       fi
+       return 0
 }
 
 drain_pool() {
@@ -237,20 +237,20 @@ test_1b() {
     create_pool_nofail ${POOL}12
     destroy_pool ${POOL}12
 }
-run_test 1b "Create a pool with a 10 character pool name"
+run_test 1b "Create a pool with a 10 char pool name"
 
 test_1c() {
     set_cleanup_trap
-    create_pool_nofail ${POOL}12345678
-    destroy_pool ${POOL}12345678
+    create_pool_nofail ${POOL}1234567
+    destroy_pool ${POOL}1234567
 }
-run_test 1c "Create a pool with a 16 character pool name"
+run_test 1c "Create a pool with a 15 char pool name"
 
 test_1d() {
     set_cleanup_trap
-    create_pool_fail ${POOL}123456789
+    create_pool_fail ${POOL}12345678
 }
-run_test 1d "Create a pool with a 17 char pool name; should fail"
+run_test 1d "Create a pool with a 16 char pool name; should fail"
 
 test_1e() {
     set_cleanup_trap
@@ -318,6 +318,23 @@ test_1m() {
 }
 run_test 1m "pool_new did not fail even though $POOL2 existed"
 
+test_1n() {
+    set_cleanup_trap
+    create_pool_nofail ${POOL}1234567
+
+    add_pool ${POOL}1234567 "OST0000" "$FSNAME-OST0000_UUID "
+    local POOL_ROOT=${POOL_ROOT:-$DIR/$tdir}
+    create_dir $POOL_ROOT ${POOL}1234567
+    dd if=/dev/zero of=$POOL_ROOT/file bs=1M count=100
+    RC=$?; [[ $RC -eq 0 ]] ||
+        error "failed to write to $POOL_ROOT/file: $RC"
+    do_facet $SINGLEMDS lctl pool_remove $FSNAME.${POOL}1234567 OST0000
+    drain_pool ${POOL}1234567
+
+    destroy_pool ${POOL}1234567
+}
+run_test 1n "Pool with a 15 char pool name works well"
+
 test_2a() {
     set_cleanup_trap
     destroy_pool $POOL