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-15007 tests: quota enable cmd fix
[fs/lustre-release.git]
/
lustre
/
tests
/
sanity-selinux.sh
diff --git
a/lustre/tests/sanity-selinux.sh
b/lustre/tests/sanity-selinux.sh
index
0897b79
..
90b5b9c
100755
(executable)
--- a/
lustre/tests/sanity-selinux.sh
+++ b/
lustre/tests/sanity-selinux.sh
@@
-120,7
+120,7
@@
test_2a() {
mds_path=${mds_path#/}
mds_path=${mds_path#/}
-
$LFS setdirstripe -i0 -c1
${DIR}/$tdir || error "create dir failed"
+
mkdir_on_mdt0
${DIR}/$tdir || error "create dir failed"
mkdir $dirname || error "cannot mkdir $dirname"
local xattrval=$(check_selinux_xattr "mds1" $mds_path)
mkdir $dirname || error "cannot mkdir $dirname"
local xattrval=$(check_selinux_xattr "mds1" $mds_path)
@@
-544,7
+544,9
@@
create_nodemap() {
check_nodemap $nm trusted_nodemap 1
sleep 10
check_nodemap $nm trusted_nodemap 1
sleep 10
+ l_getsepol || error "cannot get sepol"
sepol=$(l_getsepol | cut -d':' -f2- | xargs)
sepol=$(l_getsepol | cut -d':' -f2- | xargs)
+ [ -n "$sepol" ] || error "sepol is empty"
do_facet mgs $LCTL set_param -P nodemap.$nm.sepol="$sepol"
check_nodemap $nm sepol $sepol
do_facet mgs $LCTL set_param -P nodemap.$nm.sepol="$sepol"
check_nodemap $nm sepol $sepol
@@
-637,9
+639,12
@@
test_21b() {
[ "$MDS1_VERSION" -lt $(version_code 2.11.56) ] &&
skip "Need MDS >= 2.11.56"
[ "$MDS1_VERSION" -lt $(version_code 2.11.56) ] &&
skip "Need MDS >= 2.11.56"
+ stack_trap "restore_opencache" EXIT
+ disable_opencache
+
local sepol
local sepol
- mkdir
-p
$DIR/$tdir || error "failed to create $DIR/$tdir"
+ mkdir
_on_mdt0
$DIR/$tdir || error "failed to create $DIR/$tdir"
echo test > $DIR/$tdir/toopen ||
error "failed to write to $DIR/$tdir/toopen"
touch $DIR/$tdir/ftoremove ||
echo test > $DIR/$tdir/toopen ||
error "failed to write to $DIR/$tdir/toopen"
touch $DIR/$tdir/ftoremove ||
@@
-749,7
+754,9
@@
test_21b() {
ln $DIR/$tdir/toopen $DIR/$tdir/toopen_hl3 && error "hardlink (3)"
# reset correct sepol
ln $DIR/$tdir/toopen $DIR/$tdir/toopen_hl3 && error "hardlink (3)"
# reset correct sepol
+ l_getsepol || error "cannot get sepol"
sepol=$(l_getsepol | cut -d':' -f2- | xargs)
sepol=$(l_getsepol | cut -d':' -f2- | xargs)
+ [ -n "$sepol" ] || error "sepol is empty"
do_facet mgs $LCTL set_param -P nodemap.c0.sepol="$sepol"
check_nodemap c0 sepol $sepol
do_facet mgs $LCTL set_param -P nodemap.c0.sepol="$sepol"
check_nodemap c0 sepol $sepol