Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-3540 lod: update recovery thread
[fs/lustre-release.git]
/
lustre
/
tests
/
sanity-sec.sh
diff --git
a/lustre/tests/sanity-sec.sh
b/lustre/tests/sanity-sec.sh
old mode 100644
(file)
new mode 100755
(executable)
index
020a735
..
fe9a554
--- a/
lustre/tests/sanity-sec.sh
+++ b/
lustre/tests/sanity-sec.sh
@@
-628,8
+628,8
@@
test_7() {
local rc
remote_mgs_nodsh && skip "remote MGS with nodsh" && return
local rc
remote_mgs_nodsh && skip "remote MGS with nodsh" && return
- [ $(lustre_version_code
$SINGLEMGS
) -lt $(version_code 2.5.53) ] &&
- skip "No nodemap on $(
get_lustre_version) MGS, need 2.5.53+
" &&
+ [ $(lustre_version_code
mgs
) -lt $(version_code 2.5.53) ] &&
+ skip "No nodemap on $(
lustre_build_version mgs) MGS < 2.5.53
" &&
return
create_nodemaps
return
create_nodemaps
@@
-648,8
+648,8
@@
test_8() {
local rc
remote_mgs_nodsh && skip "remote MGS with nodsh" && return
local rc
remote_mgs_nodsh && skip "remote MGS with nodsh" && return
- [ $(lustre_version_code
$SINGLEMGS
) -lt $(version_code 2.5.53) ] &&
- skip "No nodemap on $(
get_lustre_version) MGS, need 2.5.53+
" &&
+ [ $(lustre_version_code
mgs
) -lt $(version_code 2.5.53) ] &&
+ skip "No nodemap on $(
lustre_build_version mgs) MGS < 2.5.53
" &&
return
# Set up nodemaps
return
# Set up nodemaps
@@
-679,8
+679,8
@@
test_9() {
local rc
remote_mgs_nodsh && skip "remote MGS with nodsh" && return
local rc
remote_mgs_nodsh && skip "remote MGS with nodsh" && return
- [ $(lustre_version_code
$SINGLEMGS
) -lt $(version_code 2.5.53) ] &&
- skip "No nodemap on $(
get_lustre_version) MGS, need 2.5.53+
" &&
+ [ $(lustre_version_code
mgs
) -lt $(version_code 2.5.53) ] &&
+ skip "No nodemap on $(
lustre_build_version mgs) MGS < 2.5.53
" &&
return
rc=0
return
rc=0
@@
-717,8
+717,8
@@
test_10() {
local rc
remote_mgs_nodsh && skip "remote MGS with nodsh" && return
local rc
remote_mgs_nodsh && skip "remote MGS with nodsh" && return
- [ $(lustre_version_code
$SINGLEMGS
) -lt $(version_code 2.5.53) ] &&
- skip "No nodemap on $(
get_lustre_version) MGS, need 2.5.53+
" &&
+ [ $(lustre_version_code
mgs
) -lt $(version_code 2.5.53) ] &&
+ skip "No nodemap on $(
lustre_build_version mgs) MGS < 2.5.53
" &&
return
rc=0
return
rc=0
@@
-764,8
+764,8
@@
test_11() {
local rc
remote_mgs_nodsh && skip "remote MGS with nodsh" && return
local rc
remote_mgs_nodsh && skip "remote MGS with nodsh" && return
- [ $(lustre_version_code
$SINGLEMGS
) -lt $(version_code 2.5.53) ] &&
- skip "No nodemap on $(
get_lustre_version) MGS, need 2.5.53+
" &&
+ [ $(lustre_version_code
mgs
) -lt $(version_code 2.5.53) ] &&
+ skip "No nodemap on $(
lustre_build_version mgs) MGS < 2.5.53
" &&
return
rc=0
return
rc=0
@@
-794,8
+794,8
@@
test_12() {
local rc
remote_mgs_nodsh && skip "remote MGS with nodsh" && return
local rc
remote_mgs_nodsh && skip "remote MGS with nodsh" && return
- [ $(lustre_version_code
$SINGLEMGS
) -lt $(version_code 2.5.53) ] &&
- skip "No nodemap on $(
get_lustre_version) MGS, need 2.5.53+
" &&
+ [ $(lustre_version_code
mgs
) -lt $(version_code 2.5.53) ] &&
+ skip "No nodemap on $(
lustre_build_version mgs) MGS < 2.5.53
" &&
return
rc=0
return
rc=0
@@
-832,8
+832,8
@@
test_13() {
local rc
remote_mgs_nodsh && skip "remote MGS with nodsh" && return
local rc
remote_mgs_nodsh && skip "remote MGS with nodsh" && return
- [ $(lustre_version_code
$SINGLEMGS
) -lt $(version_code 2.5.53) ] &&
- skip "No nodemap on $(
get_lustre_version) MGS, need 2.5.53+
" &&
+ [ $(lustre_version_code
mgs
) -lt $(version_code 2.5.53) ] &&
+ skip "No nodemap on $(
lustre_build_version mgs) MGS < 2.5.53
" &&
return
rc=0
return
rc=0
@@
-875,8
+875,8
@@
test_14() {
local rc
remote_mgs_nodsh && skip "remote MGS with nodsh" && return
local rc
remote_mgs_nodsh && skip "remote MGS with nodsh" && return
- [ $(lustre_version_code
$SINGLEMGS
) -lt $(version_code 2.5.53) ] &&
- skip "No nodemap on $(
get_lustre_version) MGS, need 2.5.53+
" &&
+ [ $(lustre_version_code
mgs
) -lt $(version_code 2.5.53) ] &&
+ skip "No nodemap on $(
lustre_build_version mgs) MGS < 2.5.53
" &&
return
rc=0
return
rc=0
@@
-910,8
+910,8
@@
test_15() {
local rc
remote_mgs_nodsh && skip "remote MGS with nodsh" && return
local rc
remote_mgs_nodsh && skip "remote MGS with nodsh" && return
- [ $(lustre_version_code
$SINGLEMGS
) -lt $(version_code 2.5.53) ] &&
- skip "No nodemap on $(
get_lustre_version) MGS, need 2.5.53+
" &&
+ [ $(lustre_version_code
mgs
) -lt $(version_code 2.5.53) ] &&
+ skip "No nodemap on $(
lustre_build_version mgs) MGS < 2.5.53
" &&
return
rc=0
return
rc=0
@@
-1238,8
+1238,8
@@
test_fops() {
nodemap_version_check () {
remote_mgs_nodsh && skip "remote MGS with nodsh" && return 1
nodemap_version_check () {
remote_mgs_nodsh && skip "remote MGS with nodsh" && return 1
- [ $(lustre_version_code
$SINGLEMGS) -lt $(version_code 2.6.90
) ] &&
- skip "
Skip test on $(get_lustre_version) MGS, need 2.6.90+
" &&
+ [ $(lustre_version_code
mgs) -lt $(version_code 2.5.53
) ] &&
+ skip "
No nodemap on $(lustre_build_version mgs) MGS < 2.5.53
" &&
return 1
return 0
}
return 1
return 0
}
@@
-1273,6
+1273,7
@@
nodemap_test_setup() {
}
nodemap_test_cleanup() {
}
nodemap_test_cleanup() {
+ trap 0
delete_fops_nodemaps
rc=$?
[[ $rc != 0 ]] && error "removing fops nodemaps failed $rc"
delete_fops_nodemaps
rc=$?
[[ $rc != 0 ]] && error "removing fops nodemaps failed $rc"
@@
-1301,6
+1302,7
@@
test_16() {
nodemap_version_check || return 0
nodemap_test_setup 0
nodemap_version_check || return 0
nodemap_test_setup 0
+ trap nodemap_test_cleanup EXIT
test_fops all_off
nodemap_test_cleanup
}
test_fops all_off
nodemap_test_cleanup
}
@@
-1310,6
+1312,7
@@
test_17() {
nodemap_version_check || return 0
nodemap_test_setup
nodemap_version_check || return 0
nodemap_test_setup
+ trap nodemap_test_cleanup EXIT
nodemap_clients_admin_trusted 0 1
test_fops trusted_noadmin 1
nodemap_test_cleanup
nodemap_clients_admin_trusted 0 1
test_fops trusted_noadmin 1
nodemap_test_cleanup
@@
-1319,6
+1322,8
@@
run_test 17 "test nodemap trusted_noadmin fileops"
test_18() {
nodemap_version_check || return 0
nodemap_test_setup
test_18() {
nodemap_version_check || return 0
nodemap_test_setup
+
+ trap nodemap_test_cleanup EXIT
nodemap_clients_admin_trusted 0 0
test_fops mapped_noadmin 1
nodemap_test_cleanup
nodemap_clients_admin_trusted 0 0
test_fops mapped_noadmin 1
nodemap_test_cleanup
@@
-1328,6
+1333,8
@@
run_test 18 "test nodemap mapped_noadmin fileops"
test_19() {
nodemap_version_check || return 0
nodemap_test_setup
test_19() {
nodemap_version_check || return 0
nodemap_test_setup
+
+ trap nodemap_test_cleanup EXIT
nodemap_clients_admin_trusted 1 1
test_fops trusted_admin 1
nodemap_test_cleanup
nodemap_clients_admin_trusted 1 1
test_fops trusted_admin 1
nodemap_test_cleanup
@@
-1337,6
+1344,8
@@
run_test 19 "test nodemap trusted_admin fileops"
test_20() {
nodemap_version_check || return 0
nodemap_test_setup
test_20() {
nodemap_version_check || return 0
nodemap_test_setup
+
+ trap nodemap_test_cleanup EXIT
nodemap_clients_admin_trusted 1 0
test_fops mapped_admin 1
nodemap_test_cleanup
nodemap_clients_admin_trusted 1 0
test_fops mapped_admin 1
nodemap_test_cleanup
@@
-1346,6
+1355,8
@@
run_test 20 "test nodemap mapped_admin fileops"
test_21() {
nodemap_version_check || return 0
nodemap_test_setup
test_21() {
nodemap_version_check || return 0
nodemap_test_setup
+
+ trap nodemap_test_cleanup EXIT
local x=1
local i=0
for client in $clients; do
local x=1
local i=0
for client in $clients; do
@@
-1368,6
+1379,8
@@
run_test 21 "test nodemap mapped_trusted_noadmin fileops"
test_22() {
nodemap_version_check || return 0
nodemap_test_setup
test_22() {
nodemap_version_check || return 0
nodemap_test_setup
+
+ trap nodemap_test_cleanup EXIT
local x=1
local i=0
for client in $clients; do
local x=1
local i=0
for client in $clients; do
@@
-1453,6
+1466,7
@@
test_23() {
nodemap_version_check || return 0
nodemap_test_setup
nodemap_version_check || return 0
nodemap_test_setup
+ trap nodemap_test_cleanup EXIT
# 1 trusted cluster, 1 mapped cluster
local unmapped_fs=$((IDBASE+0))
local unmapped_c1=$((IDBASE+5))
# 1 trusted cluster, 1 mapped cluster
local unmapped_fs=$((IDBASE+0))
local unmapped_c1=$((IDBASE+5))