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-1193 tests: test script fixes for incompatibility
[fs/lustre-release.git]
/
lustre
/
tests
/
conf-sanity.sh
diff --git
a/lustre/tests/conf-sanity.sh
b/lustre/tests/conf-sanity.sh
index
36b2f97
..
d937c31
100644
(file)
--- a/
lustre/tests/conf-sanity.sh
+++ b/
lustre/tests/conf-sanity.sh
@@
-1277,11
+1277,13
@@
test_32b() {
{ skip_env "Cannot untar $DISK1_8" && return ; }
load_modules
- $LCTL set_param debug="config"
+ $LCTL set_param debug="
+
config"
local NEWNAME=lustre
# writeconf will cause servers to register with their current nids
- $TUNEFS --writeconf --fsname=$NEWNAME $tmpdir/mds || error "tunefs failed"
+ $TUNEFS --writeconf --erase-params \
+ --param mdt.identity_upcall=$L_GETIDENTITY \
+ --fsname=$NEWNAME $tmpdir/mds || error "tunefs failed"
combined_mgs_mds || stop mgs
start32 mds1 $tmpdir/mds "-o loop" && \
@@
-1291,7
+1293,8
@@
test_32b() {
echo MDS uuid $UUID
[ "$UUID" == "${NEWNAME}-MDT0000_UUID" ] || error "UUID is wrong: $UUID"
- $TUNEFS --mgsnode=$HOSTNAME --writeconf --fsname=$NEWNAME $tmpdir/ost1 ||\
+ $TUNEFS --writeconf --erase-params \
+ --mgsnode=$HOSTNAME --fsname=$NEWNAME $tmpdir/ost1 ||\
error "tunefs failed"
start32 ost1 $tmpdir/ost1 "-o loop" || return 5
UUID=$($LCTL get_param -n obdfilter.${NEWNAME}-OST0000.uuid)
@@
-2765,6
+2768,9
@@
run_test 60 "check mkfs.lustre --mkfsoptions -E -O options setting"
test_61() { # LU-80
local reformat=false
+ [ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.1.53) ] ||
+ { skip "Need MDS version at least 2.1.53"; return 0; }
+
if ! large_xattr_enabled; then
reformat=true
local mds_dev=$(mdsdevname ${SINGLEMDS//mds/})