X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Ftest-framework.sh;h=e89d50cbbafcbf81fb40f2b60034f699a36938de;hp=89000f368b6172b1d0af4b3b7d36caefe44934d8;hb=edefa755da1728e9b5ec1fef990bead16f290cb6;hpb=e0063a5db5289d1433476112410e942e036b76a4 diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh index 89000f3..e89d50c 100644 --- a/lustre/tests/test-framework.sh +++ b/lustre/tests/test-framework.sh @@ -291,9 +291,9 @@ init_test_env() { export RLUSTRE=${RLUSTRE:-$LUSTRE} export RPWD=${RPWD:-$PWD} export I_MOUNTED=${I_MOUNTED:-"no"} - if [ ! -f /lib/modules/$(uname -r)/kernel/fs/lustre/mds.ko -a \ - ! -f /lib/modules/$(uname -r)/updates/kernel/fs/lustre/mds.ko -a \ - ! -f `dirname $0`/../mds/mds.ko ]; then + if [ ! -f /lib/modules/$(uname -r)/kernel/fs/lustre/mdt.ko -a \ + ! -f /lib/modules/$(uname -r)/updates/kernel/fs/lustre/mdt.ko -a \ + ! -f `dirname $0`/../mdt/mdt.ko ]; then export CLIENTMODSONLY=yes fi @@ -426,21 +426,6 @@ llite_lloop_enabled() { load_modules_local() { [ $(facet_fstype ost1) == "zfs" ] && export USE_OFD=yes - if [ "$USE_OFD" == yes ]; then - if module_loaded obdfilter; then - if ! $LUSTRE_RMMOD ldiskfs; then - echo "$HOSTNAME may still be using obdfilter.ko" - return 1 - fi - fi - else - if module_loaded ofd; then - if ! $LUSTRE_RMMOD ldiskfs; then - echo "$HOSTNAME may still be using ofd.ko" - return 1 - fi - fi - fi if [ -n "$MODPROBE" ]; then # use modprobe @@ -508,7 +493,6 @@ load_modules_local() { load_module osd-zfs/osd_zfs fi load_module mgs/mgs - load_module mds/mds load_module mdd/mdd if [[ $(node_fstypes $HOSTNAME) == *ldiskfs* ]]; then # @@ -525,11 +509,7 @@ load_modules_local() { load_module ost/ost load_module lod/lod load_module osp/osp - if [ "$USE_OFD" == yes ]; then - load_module ofd/ofd - else - load_module obdfilter/obdfilter - fi + load_module ofd/ofd load_module osp/osp fi @@ -1063,13 +1043,14 @@ quota_save_version() { # XXX This function is kept for interoperability with old server (< 2.3.50), # it should be removed whenever we drop the interoperability for such # server. -quota_type () { - local fsname=${1:-$FSNAME} - local rc=0 - do_facet mgs lctl get_param mdd.${fsname}-MDT*.quota_type || rc=$? - do_nodes $(comma_list $(osts_nodes)) \ - lctl get_param obdfilter.${fsname}-OST*.quota_type || rc=$? - return $rc +quota_type() { + local fsname=${1:-$FSNAME} + local rc=0 + do_facet $SINGLEMDS lctl get_param mdd.${fsname}-MDT*.quota_type || + rc=$? + do_nodes $(comma_list $(osts_nodes)) \ + lctl get_param obdfilter.${fsname}-OST*.quota_type || rc=$? + return $rc } # XXX This function is kept for interoperability with old server (< 2.3.50), @@ -1111,11 +1092,11 @@ setup_quota_old(){ local quota_usrs=$QUOTA_USERS # get_filesystem_size - local disksz=$(lfs df $mntpt | grep "filesystem summary:" | awk '{print $3}') + local disksz=$(lfs_df $mntpt | grep "summary" | awk '{print $2}') local blk_soft=$((disksz + 1024)) local blk_hard=$((blk_soft + blk_soft / 20)) # Go 5% over - local Inodes=$(lfs df -i $mntpt | grep "filesystem summary:" | awk '{print $3}') + local Inodes=$(lfs_df -i $mntpt | grep "summary" | awk '{print $2}') local i_soft=$Inodes local i_hard=$((i_soft + i_soft / 20)) @@ -1140,7 +1121,7 @@ setup_quota_old(){ mdt_quota_type() { local varsvc=${SINGLEMDS}_svc do_facet $SINGLEMDS $LCTL get_param -n \ - osd-$FSTYPE.${!varsvc}.quota_slave.enabled + osd-$(facet_fstype $SINGLEMDS).${!varsvc}.quota_slave.enabled } # get ost quota type @@ -1148,7 +1129,7 @@ ost_quota_type() { # All OSTs should have same quota type local varsvc=ost1_svc do_facet ost1 $LCTL get_param -n \ - osd-$FSTYPE.${!varsvc}.quota_slave.enabled + osd-$(facet_fstype ost1).${!varsvc}.quota_slave.enabled } # restore old quota type settings @@ -1168,16 +1149,19 @@ restore_quota() { fi } +# Handle the case when there is a space in the lfs df +# "filesystem summary" line the same as when there is no space. +# This will allow fixing the "lfs df" summary line in the future. +lfs_df() { + $LFS df $* | sed -e 's/filesystem /filesystem_/' +} + setup_quota(){ if [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.3.50) ]; then setup_quota_old $1 return fi - # XXX remove it once all quota code landed - echo "skip quota setup" - return - local mntpt=$1 # save old quota type & set new quota type @@ -1198,13 +1182,11 @@ setup_quota(){ local quota_usrs=$QUOTA_USERS # get_filesystem_size - local disksz=$(lfs df $mntpt | grep "filesystem summary:" | - awk '{print $3}') + local disksz=$(lfs_df $mntpt | grep "summary" | awk '{print $2}') local blk_soft=$((disksz + 1024)) local blk_hard=$((blk_soft + blk_soft / 20)) # Go 5% over - local inodes=$(lfs df -i $mntpt | grep "filesystem summary:" | - awk '{print $3}') + local inodes=$(lfs_df -i $mntpt | grep "summary" | awk '{print $2}') local i_soft=$inodes local i_hard=$((i_soft + i_soft / 20)) @@ -1744,15 +1726,16 @@ cleanup_check() { check_mem_leak || exit 204 - [ "`lctl dl 2> /dev/null | wc -l`" -gt 0 ] && lctl dl && \ - echo "$0: lustre didn't clean up..." 1>&2 && return 202 || true + [ "`lctl dl 2> /dev/null | wc -l`" -gt 0 ] && lctl dl && + echo "$TESTSUITE: lustre didn't clean up..." 1>&2 && + return 202 || true - if module_loaded lnet || module_loaded libcfs; then - echo "$0: modules still loaded..." 1>&2 - /sbin/lsmod 1>&2 - return 203 - fi - return 0 + if module_loaded lnet || module_loaded libcfs; then + echo "$TESTSUITE: modules still loaded..." 1>&2 + /sbin/lsmod 1>&2 + return 203 + fi + return 0 } wait_update () { @@ -2067,32 +2050,58 @@ affected_facets () { } facet_failover() { - local facet=$1 - local sleep_time=$2 - local host=$(facet_active_host $facet) - - echo "Failing $facet on node $host" - - local affected=$(affected_facets $facet) + local facets=$1 + local sleep_time=$2 + local -a affecteds + local facet + local total=0 + local index=0 + local skip + + #Because it will only get up facets, we need get affected + #facets before shutdown + #For HARD Failure mode, it needs make sure facets on the same + #HOST will only be shutdown and reboot once + for facet in ${facets//,/ }; do + local affected_facet + skip=0 + #check whether facet has been included in other affected facets + for ((index=0; index<$total; index++)); do + [[ *,$facet,* == ,${affecteds[index]}, ]] && skip=1 + done - shutdown_facet $facet + if [ $skip -eq 0 ]; then + affecteds[$total]=$(affected_facets $facet) + total=$((total+1)) + fi + done - echo affected facets: $affected + for ((index=0; index<$total; index++)); do + facet=$(echo ${affecteds[index]} | tr -s " " | cut -d"," -f 1) + local host=$(facet_active_host $facet) + echo "Failing ${affecteds[index]} on $host" + shutdown_facet $facet + done - [ -n "$sleep_time" ] && sleep $sleep_time + for ((index=0; index<$total; index++)); do + facet=$(echo ${affecteds[index]} | tr -s " " | cut -d"," -f 1) + echo reboot facets: ${affecteds[index]} - reboot_facet $facet + reboot_facet $facet - change_active $affected + change_active ${affecteds[index]} - wait_for_facet $affected - # start mgs first if it is affected - if ! combined_mgs_mds && list_member $affected mgs; then - mount_facet mgs || error "Restart of mgs failed" - fi - # FIXME; has to be changed to mount all facets concurrently - affected=$(exclude_items_from_list $affected mgs) - mount_facets $affected + wait_for_facet ${affecteds[index]} + # start mgs first if it is affected + if ! combined_mgs_mds && + list_member ${affecteds[index]} mgs; then + mount_facet mgs || error "Restart of mgs failed" + fi + # FIXME; has to be changed to mount all facets concurrently + affected=$(exclude_items_from_list ${affecteds[index]} mgs) + echo mount facets: ${affecteds[index]} + mount_facets ${affecteds[index]} + done } obd_name() { @@ -2316,21 +2325,26 @@ hostlist_expand() { } facet_host() { - local facet=$1 - - [ "$facet" == client ] && echo -n $HOSTNAME && return - varname=${facet}_HOST - if [ -z "${!varname}" ]; then - if [ "${facet:0:3}" == "ost" ]; then - eval ${facet}_HOST=${ost_HOST} - fi - fi - echo -n ${!varname} + local facet=$1 + local varname + + [ "$facet" == client ] && echo -n $HOSTNAME && return + varname=${facet}_HOST + if [ -z "${!varname}" ]; then + if [ "${facet:0:3}" == "ost" ]; then + eval export ${facet}_HOST=${ost_HOST} + elif [ "${facet:0:3}" == "mdt" -o \ + "${facet:0:3}" == "mds" -o \ + "${facet:0:3}" == "mgs" ]; then + eval export ${facet}_HOST=${mds_HOST} + fi + fi + echo -n ${!varname} } facet_failover_host() { local facet=$1 - local var + local varname var=${facet}failover_HOST if [ -n "${!var}" ]; then @@ -2338,12 +2352,18 @@ facet_failover_host() { return fi + if [ "${facet:0:3}" == "mdt" -o "${facet:0:3}" == "mds" -o \ + "${facet:0:3}" == "mgs" ]; then + + eval export ${facet}failover_host=${mds_HOST} + echo ${mds_HOST} + return + fi + if [[ $facet == ost* ]]; then - var=ostfailover_HOST - if [ -n "${!var}" ]; then - echo ${!var} - return - fi + eval export ${facet}failover_host=${ost_HOST} + echo ${ost_HOST} + return fi } @@ -2650,17 +2670,16 @@ mdsvdevname() { } mgsdevname() { - DEVNAME=MGSDEV + local DEVNAME=MGSDEV + local MDSDEV1=$(mdsdevname 1) - local fstype=$(facet_fstype mds$num) + local fstype=$(facet_fstype mds1) case $fstype in - ldiskfs ) + ldiskfs|zfs ) #if $MGSDEV isn't defined, default is $MDSDEV1 + #ZFS independent mgsdev should be ${FSNAME}-mgs/mgs eval DEVPTR=${!DEVNAME:=${MDSDEV1}};; - zfs ) - #dataset name is independent of vdev device names - eval DEVPTR=${FSNAME}-mgs/mgs;; * ) error "unknown fstype!";; esac @@ -2671,7 +2690,7 @@ mgsdevname() { mgsvdevname() { DEVNAME=MGSDEV - local fstype=$(facet_fstype mds$num) + local fstype=$(facet_fstype mds1) case $fstype in ldiskfs ) @@ -2756,7 +2775,8 @@ cleanupall() { } combined_mgs_mds () { - [[ $MDSDEV1 = $MGSDEV ]] && [[ $mds1_HOST = $mgs_HOST ]] + [[ "$(mdsdevname 1)" = "$(mgsdevname)" ]] && + [[ "$(facet_host mds1)" = "$(facet_host mgs)" ]] } lower() { @@ -2769,9 +2789,11 @@ upper() { mkfs_opts() { local facet=$1 + local dev=$2 local type=$(facet_type $facet) local index=$(($(facet_number $facet) - 1)) local fstype=$(facet_fstype $facet) + local host=$(facet_host $facet) local opts local fs_mkfs_opts local var @@ -2780,7 +2802,9 @@ mkfs_opts() { return 1 fi - if [ $type == MGS ] || ( [ $type == MDS ] && combined_mgs_mds ); then + if [ $type == MGS ] || ( [ $type == MDS ] && + [ "$dev" == $(mgsdevname) ] && + [ "$host" == "$(facet_host mgs)" ] ); then opts="--mgs" else opts="--mgsnode=$MGSNID" @@ -2806,8 +2830,6 @@ mkfs_opts() { opts+=${L_GETIDENTITY:+" --param=mdt.identity_upcall=$L_GETIDENTITY"} if [ $fstype == ldiskfs ]; then - opts+=${IAMDIR:+" --iam-dir"} - fs_mkfs_opts+=${MDSJOURNALSIZE:+" -J size=$MDSJOURNALSIZE"} fs_mkfs_opts+=${MDSISIZE:+" -i $MDSISIZE"} fi @@ -2859,23 +2881,23 @@ formatall() { echo Formatting mgs, mds, osts if ! combined_mgs_mds ; then echo "Format mgs: $(mgsdevname)" - add mgs $(mkfs_opts mgs) --reformat $(mgsdevname) \ - $(mgsvdevname) ${quiet:+>/dev/null} || exit 10 - fi + add mgs $(mkfs_opts mgs $(mgsdevname)) --reformat \ + $(mgsdevname) $(mgsvdevname) ${quiet:+>/dev/null} || exit 10 + fi - for num in `seq $MDSCOUNT`; do - echo "Format mds$num: $(mdsdevname $num)" - add mds$num $(mkfs_opts mds$num) --reformat \ - $(mdsdevname $num) $(mdsvdevname $num) \ - ${quiet:+>/dev/null} || exit 10 - done + for num in $(seq $MDSCOUNT); do + echo "Format mds$num: $(mdsdevname $num)" + add mds$num $(mkfs_opts mds$num $(mdsdevname ${num})) \ + --reformat $(mdsdevname $num) $(mdsvdevname $num) \ + ${quiet:+>/dev/null} || exit 10 + done - for num in `seq $OSTCOUNT`; do - echo "Format ost$num: $(ostdevname $num)" - add ost$num $(mkfs_opts ost$num) --reformat \ - $(ostdevname $num) $(ostvdevname ${num}) \ - ${quiet:+>/dev/null} || exit 10 - done + for num in $(seq $OSTCOUNT); do + echo "Format ost$num: $(ostdevname $num)" + add ost$num $(mkfs_opts ost$num $(ostdevname ${num})) \ + --reformat $(ostdevname $num) $(ostvdevname ${num}) \ + ${quiet:+>/dev/null} || exit 10 + done } mount_client() { @@ -3025,65 +3047,98 @@ mounted_lustre_filesystems() { } init_facet_vars () { - [ "$CLIENTONLY" ] && return 0 - local facet=$1 - shift - local device=$1 + [ "$CLIENTONLY" ] && return 0 + local facet=$1 + shift + local device=$1 - shift + shift - eval export ${facet}_dev=${device} - eval export ${facet}_opt=\"$@\" + eval export ${facet}_dev=${device} + eval export ${facet}_opt=\"$@\" - local dev=${facet}_dev - local label=$(devicelabel ${facet} ${!dev}) - [ -z "$label" ] && echo no label for ${!dev} && exit 1 + local dev=${facet}_dev - eval export ${facet}_svc=${label} + # We need to loop for the label + # in case its not initialized yet. + for wait_time in {0,1,3,5,10}; do - local varname=${facet}failover_HOST - if [ -z "${!varname}" ]; then - eval $varname=$(facet_host $facet) - fi + if [ $wait_time -gt 0 ]; then + echo "${!dev} not yet initialized,"\ + "waiting ${wait_time} seconds." + sleep $wait_time + fi - # ${facet}failover_dev is set in cfg file - varname=${facet}failover_dev - if [ -n "${!varname}" ] ; then - eval export ${facet}failover_dev=${!varname} - else - eval export ${facet}failover_dev=$device - fi + local label=$(devicelabel ${facet} ${!dev}) - # get mount point of already mounted device - # is facet_dev is already mounted then use the real - # mount point of this facet; otherwise use $(facet_mntpt $facet) - # i.e. ${facet}_MOUNT if specified by user or default - local mntpt=$(do_facet ${facet} cat /proc/mounts | \ - awk '"'${!dev}'" == $1 && $3 == "lustre" { print $2 }') - if [ -z $mntpt ]; then - mntpt=$(facet_mntpt $facet) - fi - eval export ${facet}_MOUNT=$mntpt + # Check to make sure the label does + # not include ffff at the end of the label. + # This indicates it has not been initialized yet. + + if [[ $label =~ [f|F]{4}$ ]]; then + # label is not initialized, unset the result + # and either try again or fail + unset label + else + break + fi + done + + [ -z "$label" ] && echo no label for ${!dev} && exit 1 + + eval export ${facet}_svc=${label} + + local varname=${facet}failover_HOST + if [ -z "${!varname}" ]; then + eval export $varname=$(facet_host $facet) + fi + + varname=${facet}_HOST + if [ -z "${!varname}" ]; then + eval export $varname=$(facet_host $facet) + fi + + # ${facet}failover_dev is set in cfg file + varname=${facet}failover_dev + if [ -n "${!varname}" ] ; then + eval export ${facet}failover_dev=${!varname} + else + eval export ${facet}failover_dev=$device + fi + + # get mount point of already mounted device + # is facet_dev is already mounted then use the real + # mount point of this facet; otherwise use $(facet_mntpt $facet) + # i.e. ${facet}_MOUNT if specified by user or default + local mntpt=$(do_facet ${facet} cat /proc/mounts | \ + awk '"'${!dev}'" == $1 && $3 == "lustre" { print $2 }') + if [ -z $mntpt ]; then + mntpt=$(facet_mntpt $facet) + fi + eval export ${facet}_MOUNT=$mntpt } init_facets_vars () { - local DEVNAME + local DEVNAME - if ! remote_mds_nodsh; then - for num in `seq $MDSCOUNT`; do - DEVNAME=`mdsdevname $num` - init_facet_vars mds$num $DEVNAME $MDS_MOUNT_OPTS - done - fi + if ! remote_mds_nodsh; then + for num in $(seq $MDSCOUNT); do + DEVNAME=`mdsdevname $num` + eval export MDSDEV${num}=$DEVNAME + init_facet_vars mds$num $DEVNAME $MDS_MOUNT_OPTS + done + fi + eval export MGSDEV=$(mgsdevname) combined_mgs_mds || init_facet_vars mgs $(mgsdevname) $MGS_MOUNT_OPTS - remote_ost_nodsh && return - - for num in `seq $OSTCOUNT`; do - DEVNAME=`ostdevname $num` - init_facet_vars ost$num $DEVNAME $OST_MOUNT_OPTS - done + if ! remote_ost_nodsh; then + for num in $(seq $OSTCOUNT); do + DEVNAME=$(ostdevname $num) + eval export OSTDEV${num}=$DEVNAME + init_facet_vars ost$num $DEVNAME $OST_MOUNT_OPTS + done + fi } osc_ensure_active () { @@ -3406,7 +3461,7 @@ run_e2fsck() { local extra_opts=$3 df > /dev/null # update statfs data on disk - local cmd="$E2FSCK -d -v -t -t -f -n $extra_opts $target_dev" + local cmd="$E2FSCK -d -v -t -t -f $extra_opts $target_dev" echo $cmd local rc=0 do_node $node $cmd || rc=$? @@ -3442,14 +3497,14 @@ generate_db() { [ $MDSCOUNT -eq 1 ] || error "CMD is not supported" - run_e2fsck $(mdts_nodes) $MDTDEV "--mdsdb $MDSDB" + run_e2fsck $(mdts_nodes) $MDTDEV "-n --mdsdb $MDSDB" i=0 ostidx=0 OSTDB_LIST="" for node in $(osts_nodes); do for dev in ${OSTDEVS[i]}; do - run_e2fsck $node $dev "--mdsdb $MDSDB --ostdb $OSTDB-$ostidx" + run_e2fsck $node $dev "-n --mdsdb $MDSDB --ostdb $OSTDB-$ostidx" OSTDB_LIST="$OSTDB_LIST $OSTDB-$ostidx" ostidx=$((ostidx + 1)) done @@ -3719,7 +3774,7 @@ pause_bulk() { } drop_ldlm_cancel() { -#define OBD_FAIL_LDLM_CANCEL 0x304 +#define OBD_FAIL_LDLM_CANCEL_NET 0x304 local RC=0 local list=$(comma_list $(mdts_nodes) $(osts_nodes)) do_nodes $list lctl set_param fail_loc=0x304 @@ -3731,12 +3786,12 @@ drop_ldlm_cancel() { } drop_bl_callback() { -#define OBD_FAIL_LDLM_BL_CALLBACK 0x305 - RC=0 - do_facet client lctl set_param fail_loc=0x305 - do_facet client "$@" || RC=$? - do_facet client lctl set_param fail_loc=0 - return $RC +#define OBD_FAIL_LDLM_BL_CALLBACK_NET 0x305 + RC=0 + do_facet client lctl set_param fail_loc=0x80000305 + do_facet client "$@" || RC=$? + do_facet client lctl set_param fail_loc=0 + return $RC } drop_ldlm_reply() { @@ -3868,9 +3923,10 @@ error_noexit() { gather_logs $(comma_list $(nodes_list)) fi - debugrestore - [ "$TESTSUITELOG" ] && echo "$0: ${TYPE}: $TESTNAME $@" >> $TESTSUITELOG - echo "$@" > $LOGDIR/err + debugrestore + [ "$TESTSUITELOG" ] && + echo "$TESTSUITE: $TYPE: $TESTNAME $@" >> $TESTSUITELOG + echo "$@" > $LOGDIR/err } exit_status () { @@ -4030,10 +4086,6 @@ run_test() { return $? } -equals_msg() { - banner "$*" -} - log() { echo "$*" module_loaded lnet || load_modules @@ -4060,9 +4112,11 @@ trace() { } complete () { - equals_msg $1 test complete, duration $2 sec + local duration=$1 + + banner test complete, duration $duration sec [ -f "$TESTSUITELOG" ] && egrep .FAIL $TESTSUITELOG || true - echo duration $2 >>$TESTSUITELOG + echo duration $duration >>$TESTSUITELOG } pass() { @@ -5557,12 +5611,13 @@ run_llverfs() { local dir=$1 local llverfs_opts=$2 + local use_partial_arg=$3 local partial_arg="" local size=$(df -B G $dir |tail -n 1 |awk '{print $2}' |sed 's/G//') #GB # Run in partial (fast) mode if the size # of a partition > 1 GB - [ $size -gt 1 ] && partial_arg="-p" + [ "x$use_partial_arg" != "xno" ] && [ $size -gt 1 ] && partial_arg="-p" llverfs $partial_arg $llverfs_opts $dir } @@ -5683,10 +5738,12 @@ get_block_size() { # Check whether the "large_xattr" feature is enabled or not. large_xattr_enabled() { - local mds_dev=$(mdsdevname ${SINGLEMDS//mds/}) + [[ $(facet_fstype $SINGLEMDS) == zfs ]] && return 0 - do_facet $SINGLEMDS "$DUMPE2FS -h $mds_dev 2>&1 | grep -q large_xattr" - return ${PIPESTATUS[0]} + local mds_dev=$(mdsdevname ${SINGLEMDS//mds/}) + + do_facet $SINGLEMDS "$DUMPE2FS -h $mds_dev 2>&1 | grep -q large_xattr" + return ${PIPESTATUS[0]} } # Get the maximum xattr size supported by the filesystem. @@ -5740,6 +5797,7 @@ mds_backup_restore() { local metaea=${TMP}/backup_restore.ea local metadata=${TMP}/backup_restore.tgz local opts=${MDS_MOUNT_OPTS} + local svc=${SINGLEMDS}_svc if ! ${rcmd} test -b ${devname}; then opts=$(csa_add "$opts" -o loop) @@ -5783,6 +5841,8 @@ mds_backup_restore() { ${rcmd} umount -d $mntpt || return 10 # step 14: cleanup tmp backup ${rcmd} rm -f $metaea $metadata + # step 15: reset device label - it's not virgin on + ${rcmd} e2label $devname ${!svc} } # remove OI files @@ -5820,3 +5880,11 @@ mds_remove_ois() { ${rcmd} umount -d $mntpt || return 2 # OI files will be recreated when mounted as lustre next time. } + +# generate maloo upload-able log file name +# \param logname specify unique part of file name +generate_logname() { + local logname=${1:-"default_logname"} + + echo "$TESTLOG_PREFIX.$TESTNAME.$logname.$(hostname -s).log" +}