Changed the required places which directly call lctl
pool_new command to use create_pool() wrapper.
Seagate-bug-id: MRP-2683
Signed-off-by: Jadhav Vikram <jadhav.vikram@seagate.com>
Change-Id: I83a867072ae289f820036338249182a3112e7fba
Reviewed-on: http://es-gerrit.xyus.xyratex.com:8080/11162
Reviewed-by: Vladimir Saveliev <vladimir.saveliev@seagate.com>
Reviewed-by: Rahul Deshmukh <rahul.deshmukh@seagate.com>
Tested-by: Elena V. Gryaznova <elena.gryaznova@seagate.com>
Reviewed-on: https://review.whamcloud.com/23541
Reviewed-by: Fan Yong <fan.yong@intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
- create_pool $FSNAME.$1
- if [[ $? != 0 ]]; then
- error "Pool creation of $1 failed"
- fi
+ create_pool $FSNAME.$1
+ [[ $? -ne 0 ]] && error "Pool creation of $1 failed"
+ return 0
- create_pool $FSNAME.$1
- if [[ $? == 0 ]]; then
- error "Pool creation of $1 succeeded; should have failed"
- fi
+ create_pool $FSNAME.$1
+ [[ $? -ne 0 ]] ||
+ error "Pool creation of $1 succeeded; should have failed"
+ return 0
test_1f() {
set_cleanup_trap
test_1f() {
set_cleanup_trap
- do_facet mgs lctl pool_new .$POOL 2>/dev/null
[[ $? -ne 0 ]] ||
error "pool_new did not fail even though fs-name was missing"
}
[[ $? -ne 0 ]] ||
error "pool_new did not fail even though fs-name was missing"
}
test_1g() {
set_cleanup_trap
test_1g() {
set_cleanup_trap
- do_facet mgs lctl pool_new $POOL 2>/dev/null
[[ $? -ne 0 ]] ||
error "pool_new did not fail even though fs-name was missing"
}
[[ $? -ne 0 ]] ||
error "pool_new did not fail even though fs-name was missing"
}
test_1h() {
set_cleanup_trap
test_1h() {
set_cleanup_trap
- do_facet mgs lctl pool_new ${FSNAME}. 2>/dev/null
[[ $? -ne 0 ]] ||
error "pool_new did not fail even though pool name was missing"
}
[[ $? -ne 0 ]] ||
error "pool_new did not fail even though pool name was missing"
}
test_1i() {
set_cleanup_trap
test_1i() {
set_cleanup_trap
- do_facet mgs lctl pool_new . 2>/dev/null
- error "pool_new did not fail even if pool and fs-name were missing"
+ error "pool_new did not fail even if pool/fs-name was missing"
}
run_test 1i "pool_new should fail if poolname and fs-name are missing"
test_1j() {
set_cleanup_trap
}
run_test 1i "pool_new should fail if poolname and fs-name are missing"
test_1j() {
set_cleanup_trap
- do_facet mgs lctl pool_new ${FSNAME},$POOL 2>/dev/null
+ create_pool ${FSNAME},$POOL
- error "pool_new did not fail even though pool name format was wrong"
+ error "pool_new did not fail even if poolname format was wrong"
}
run_test 1j "pool_new should fail if poolname format is wrong"
test_1k() {
set_cleanup_trap
}
run_test 1j "pool_new should fail if poolname format is wrong"
test_1k() {
set_cleanup_trap
- do_facet mgs lctl pool_new ${FSNAME}/$POOL 2>/dev/null
+ create_pool ${FSNAME}/$POOL
- error "pool_new did not fail even though pool name format was wrong"
+ error "pool_new did not fail even if poolname format was wrong"
}
run_test 1k "pool_new should fail if poolname format is wrong"
test_1m() {
set_cleanup_trap
create_pool_nofail $POOL2
}
run_test 1k "pool_new should fail if poolname format is wrong"
test_1m() {
set_cleanup_trap
create_pool_nofail $POOL2
- do_facet mgs lctl pool_new ${FSNAME}.$POOL2 2>/dev/null
+ create_pool ${FSNAME}.$POOL2
[[ $? -ne 0 ]] ||
error "pool_new did not fail even though $POOL2 existed"
destroy_pool $POOL2
[[ $? -ne 0 ]] ||
error "pool_new did not fail even though $POOL2 existed"
destroy_pool $POOL2
- do_facet mgs lctl pool_new qwerty
[ $? -ne 22 ] && error "can create a pool with no fsname"
# No pool name
[ $? -ne 22 ] && error "can create a pool with no fsname"
# No pool name
- do_facet mgs lctl pool_new $FSNAME.
[ $? -ne 22 ] && error "can create a pool with no name"
# Invalid character
[ $? -ne 22 ] && error "can create a pool with no name"
# Invalid character
- do_facet mgs lctl pool_new $FSNAME.0123456789^bdef
+ create_pool $FSNAME.0123456789^bdef
[ $? -ne 22 ] && error "can create a pool with an invalid name"
# Too long
[ $? -ne 22 ] && error "can create a pool with an invalid name"
# Too long
- do_facet mgs lctl pool_new $FSNAME.0123456789abdefg
+ create_pool $FSNAME.0123456789abdefg
[ $? -ne 36 ] && error "can create a pool with a name too long"
return 0
[ $? -ne 36 ] && error "can create a pool with a name too long"
return 0
test_85b() { #bug 16774
lctl set_param -n ldlm.cancel_unused_locks_before_replay "1"
test_85b() { #bug 16774
lctl set_param -n ldlm.cancel_unused_locks_before_replay "1"
- do_facet mgs $LCTL pool_new $FSNAME.$TESTNAME ||
+ create_pool $FSNAME.$TESTNAME ||
error "unable to create pool $TESTNAME"
do_facet mgs $LCTL pool_add $FSNAME.$TESTNAME $FSNAME-OST0000 ||
error "unable to add pool $TESTNAME"
error "unable to create pool $TESTNAME"
do_facet mgs $LCTL pool_add $FSNAME.$TESTNAME $FSNAME-OST0000 ||
error "unable to add pool $TESTNAME"
do_facet ost$((OSTIDX + 1)) lctl set_param fail_val=-1
#define OBD_FAIL_OST_ENOINO 0x229
do_facet ost$((OSTIDX + 1)) lctl set_param fail_loc=0x229
do_facet ost$((OSTIDX + 1)) lctl set_param fail_val=-1
#define OBD_FAIL_OST_ENOINO 0x229
do_facet ost$((OSTIDX + 1)) lctl set_param fail_loc=0x229
- do_facet mgs $LCTL pool_new $FSNAME.$TESTNAME || return 1
+ create_pool $FSNAME.$TESTNAME || return 1
do_facet mgs $LCTL pool_add $FSNAME.$TESTNAME $OST || return 2
$SETSTRIPE $DIR/$tdir -i $OSTIDX -c 1 -p $FSNAME.$TESTNAME
do_facet mgs $LCTL pool_add $FSNAME.$TESTNAME $OST || return 2
$SETSTRIPE $DIR/$tdir -i $OSTIDX -c 1 -p $FSNAME.$TESTNAME
osp.$mdtosc_proc1.reserved_mb_low)
echo "prev high watermark $last_wm_h, prev low watermark $last_wm_l"
osp.$mdtosc_proc1.reserved_mb_low)
echo "prev high watermark $last_wm_h, prev low watermark $last_wm_l"
- do_facet mgs $LCTL pool_new $FSNAME.$TESTNAME ||
- error "Pool creation failed"
+ create_pool $FSNAME.$TESTNAME || error "Pool creation failed"
do_facet mgs $LCTL pool_add $FSNAME.$TESTNAME $ost_name ||
error "Adding $ost_name to pool failed"
do_facet mgs $LCTL pool_add $FSNAME.$TESTNAME $ost_name ||
error "Adding $ost_name to pool failed"