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-839 tests: test_52 fails with loop devices MRP-233
[fs/lustre-release.git]
/
lustre
/
tests
/
conf-sanity.sh
diff --git
a/lustre/tests/conf-sanity.sh
b/lustre/tests/conf-sanity.sh
index
be90e8a
..
fc6ec98
100644
(file)
--- a/
lustre/tests/conf-sanity.sh
+++ b/
lustre/tests/conf-sanity.sh
@@
-1983,9
+1983,9
@@
test_46a() {
# wait until osts in sync
for (( i=2; i<=$OSTCOUNT; i++ )); do
wait_osc_import_state mds ost$i FULL
# wait until osts in sync
for (( i=2; i<=$OSTCOUNT; i++ )); do
wait_osc_import_state mds ost$i FULL
+ wait_osc_import_state client ost$i FULL
done
done
-
#second client see all ost's
mount_client $MOUNT2 || return 8
#second client see all ost's
mount_client $MOUNT2 || return 8
@@
-2454,6
+2454,8
@@
test_52() {
[ $? -eq 0 ] || { error "Unable to stop ost1"; return 11; }
echo mount ost1 as ldiskfs
[ $? -eq 0 ] || { error "Unable to stop ost1"; return 11; }
echo mount ost1 as ldiskfs
+ do_node $ost1node mkdir -p $ost1mnt
+ [ $? -eq 0 ] || { error "Unable to create $ost1mnt"; return 23; }
do_node $ost1node mount -t $FSTYPE $ost1_dev $ost1mnt $OST_MOUNT_OPTS
[ $? -eq 0 ] || { error "Unable to mount ost1 as ldiskfs"; return 12; }
do_node $ost1node mount -t $FSTYPE $ost1_dev $ost1mnt $OST_MOUNT_OPTS
[ $? -eq 0 ] || { error "Unable to mount ost1 as ldiskfs"; return 12; }
@@
-2476,7
+2478,7
@@
test_52() {
diff_files_xattrs $ost1node $ost1tmp/objects $ost1tmp/object_xattrs $objects
[ $? -eq 0 ] || { error "Unable to diff objects"; return 16; }
diff_files_xattrs $ost1node $ost1tmp/objects $ost1tmp/object_xattrs $objects
[ $? -eq 0 ] || { error "Unable to diff objects"; return 16; }
- do_node $ost1node "umount $ost1
_dev
"
+ do_node $ost1node "umount $ost1
mnt
"
[ $? -eq 0 ] || { error "Unable to umount ost1 as ldiskfs"; return 17; }
start_ost
[ $? -eq 0 ] || { error "Unable to umount ost1 as ldiskfs"; return 17; }
start_ost