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-6345 test: compare /bin/sleep in sanity-hsm.sh test_30c
[fs/lustre-release.git]
/
lustre
/
tests
/
sanity-sec.sh
diff --git
a/lustre/tests/sanity-sec.sh
b/lustre/tests/sanity-sec.sh
index
3a478f2
..
b50bf96
100644
(file)
--- a/
lustre/tests/sanity-sec.sh
+++ b/
lustre/tests/sanity-sec.sh
@@
-7,8
+7,8
@@
set -e
ONLY=${ONLY:-"$*"}
set -e
ONLY=${ONLY:-"$*"}
-# bug number for skipped test: 19430
LU-5423
19967 19967
-ALWAYS_EXCEPT=" 2
4
5 6 $SANITY_SEC_EXCEPT"
+# bug number for skipped test: 19430 19967 19967
+ALWAYS_EXCEPT=" 2 5 6 $SANITY_SEC_EXCEPT"
# UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT!
[ "$ALWAYS_EXCEPT$EXCEPT" ] && \
# UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT!
[ "$ALWAYS_EXCEPT$EXCEPT" ] && \
@@
-1220,14
+1220,15
@@
create_fops_nodemaps() {
local i=0
local client
for client in $clients; do
local i=0
local client
for client in $clients; do
- local client_ip=$($LUSTRE/tests/resolveip $client)
+ local client_ip=$(host_nids_address $client $NETTYPE)
+ local client_nid=$(h2$NETTYPE $client_ip)
do_facet mgs $LCTL nodemap_add c${i} || return 1
do_facet mgs $LCTL nodemap_add_range \
do_facet mgs $LCTL nodemap_add c${i} || return 1
do_facet mgs $LCTL nodemap_add_range \
- --name c${i} --range $client_
ip@tcp
|| return 1
+ --name c${i} --range $client_
nid
|| return 1
do_facet ost0 $LCTL set_param nodemap.add_nodemap=c${i} ||
return 1
do_facet ost0 "$LCTL set_param nodemap.add_nodemap_range='c$i \
do_facet ost0 $LCTL set_param nodemap.add_nodemap=c${i} ||
return 1
do_facet ost0 "$LCTL set_param nodemap.add_nodemap_range='c$i \
- $client_
ip@tcp
'" || return 1
+ $client_
nid
'" || return 1
for map in ${FOPS_IDMAPS[i]}; do
do_facet mgs $LCTL nodemap_add_idmap --name c${i} \
--idtype uid --idmap ${map} || return 1
for map in ${FOPS_IDMAPS[i]}; do
do_facet mgs $LCTL nodemap_add_idmap --name c${i} \
--idtype uid --idmap ${map} || return 1
@@
-1282,6
+1283,9
@@
fops_test_setup() {
do_facet ost0 $LCTL set_param nodemap.c0.admin_nodemap=$admin
do_facet ost0 $LCTL set_param nodemap.c0.trusted_nodemap=$trust
do_facet ost0 $LCTL set_param nodemap.c0.admin_nodemap=$admin
do_facet ost0 $LCTL set_param nodemap.c0.trusted_nodemap=$trust
+ # flush MDT locks to make sure they are reacquired before test
+ do_node ${clients_arr[0]} lctl set_param \
+ ldlm.namespaces.$FSNAME-MDT*.lru_size=clear
}
do_create_delete() {
}
do_create_delete() {
@@
-1311,8
+1315,8
@@
nodemap_check_quota() {
do_fops_quota_test() {
local run_u=$1
# define fuzz as 2x ost block size in K
do_fops_quota_test() {
local run_u=$1
# define fuzz as 2x ost block size in K
- local quota_fuzz=$(($(lctl get_param -n
osc.lustre-OST0000-*.blocksize |
- head -1) / 512))
+ local quota_fuzz=$(($(lctl get_param -n
\
+
osc.$FSNAME-OST0000-*.blocksize |
head -1) / 512))
local qused_orig=$(nodemap_check_quota "$run_u")
local qused_low=$((qused_orig - quota_fuzz))
local qused_high=$((qused_orig + quota_fuzz))
local qused_orig=$(nodemap_check_quota "$run_u")
local qused_low=$((qused_orig - quota_fuzz))
local qused_high=$((qused_orig + quota_fuzz))
@@
-1413,7
+1417,10
@@
test_fops() {
local mds_i
local rc=0
local perm_bit_list="0 3 $((0300)) $((0303))"
local mds_i
local rc=0
local perm_bit_list="0 3 $((0300)) $((0303))"
- [ "$SLOW" == "yes" ] && perm_bit_list=$(seq 0 511)
+ # SLOW tests 000-007, 010-070, 100-700 (octal modes)
+ [ "$SLOW" == "yes" ] &&
+ perm_bit_list="0 $(seq 1 7) $(seq 8 8 63) $(seq 64 64 511) \
+ $((0303))"
# step through mds users. -1 means root
for mds_i in -1 0 1 2; do
# step through mds users. -1 means root
for mds_i in -1 0 1 2; do
@@
-1469,8
+1476,8
@@
nodemap_test_setup() {
do_facet mgs $LCTL set_param $IDENTITY_UPCALL=NONE
remote_mgs_nodsh && skip "remote MGS with nodsh" && return
do_facet mgs $LCTL set_param $IDENTITY_UPCALL=NONE
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 $SINGLEMGS) -lt $(version_code 2.
6.90
) ] &&
+ skip "
Skip test on $(get_lustre_version) MGS, need 2.6.90
+" &&
return
rc=0
return
rc=0
@@
-1636,7
+1643,6
@@
nodemap_acl_test() {
nodemap_acl_test_setup
sleep 5
nodemap_acl_test_setup
sleep 5
- do_node $set_client $RUNAS_USER find $DIR/ -ls
do_node $set_client $RUNAS_USER touch $testfile
# ACL masks aren't filtered by nodemap code, so we ignore them
do_node $set_client $RUNAS_USER touch $testfile
# ACL masks aren't filtered by nodemap code, so we ignore them