summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
980a7df)
In lfsck test, remove_objects() should remove objects from OST,
just like remove_files() removes files from MDT.
Test-Parameters: testlist=lfsck
Signed-off-by: Liu Ying <emoly.liu@intel.com>
Change-Id: I826bea7c780de275c1890e920deb3c8e8e942c53
Reviewed-on: http://review.whamcloud.com/5981
Reviewed-by: Niu Yawei <yawei.niu@intel.com>
Tested-by: Hudson
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Tested-by: Maloo <whamcloud.maloo@gmail.com>
for f in $(seq -f testfile.%g $first $last); do
test_file=$test_dir/$f
files="$files $test_file"
for f in $(seq -f testfile.%g $first $last); do
test_file=$test_dir/$f
files="$files $test_file"
# Remove objects associated with files.
remove_objects() {
# Remove objects associated with files.
remove_objects() {
- local ostdev=$1
- shift
- local group=$1
- shift
- local objids="$@"
- local facet=ost$((OSTIDX + 1))
- local mntpt=$(facet_mntpt $facet)
- local opts=$OST_MOUNT_OPTS
- local i
- local rc
-
- echo "removing objects from $ostdev on $facet: $objids"
- if ! do_facet $facet test -b $ostdev; then
- opts=$(csa_add "$opts" -o loop)
- fi
- mount -t $(facet_fstype $facet) $opts $ostdev $mntpt ||
- return $?
- rc=0;
- for i in $objids; do
- rm $mntpt/O/$group/d$((i % 32))/$i || { rc=$?; break; }
- done
- umount -f $mntpt || return $?
- return $rc
+ do_rpc_nodes $1 remove_ost_objects $@
}
# Remove files from MDS.
}
# Remove files from MDS.
# remove objects associated with files in group $OBJGRP
# on the OST with index $OSTIDX
# remove objects associated with files in group $OBJGRP
# on the OST with index $OSTIDX
- remove_objects $OSTDEV $OBJGRP $OST_REMOVE ||
+ remove_objects $OSTNODE $OSTDEV $OBJGRP $OST_REMOVE ||
error "removing objects failed"
# remove files from MDS
error "removing objects failed"
# remove files from MDS
llverfs $partial_arg $llverfs_opts $dir
}
llverfs $partial_arg $llverfs_opts $dir
}
+#Remove objects from OST
+remove_ost_objects() {
+ shift
+ local ostdev=$1
+ local group=$2
+ shift 2
+ local objids="$@"
+ local facet=ost$((OSTIDX + 1))
+ local mntpt=$(facet_mntpt $facet)
+ local opts=$OST_MOUNT_OPTS
+ local i
+ local rc
+
+ echo "removing objects from $ostdev on $facet: $objids"
+ if ! do_facet $facet test -b $ostdev; then
+ opts=$(csa_add "$opts" -o loop)
+ fi
+ mount -t $(facet_fstype $facet) $opts $ostdev $mntpt ||
+ return $?
+ rc=0;
+ for i in $objids; do
+ rm $mntpt/O/$group/d$((i % 32))/$i || { rc=$?; break; }
+ done
+ umount -f $mntpt || return $?
+ return $rc
+}
+
+#Remove files from MDT
remove_mdt_files() {
local facet=$1
local mdtdev=$2
remove_mdt_files() {
local facet=$1
local mdtdev=$2