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-10675 tests: increase default MDSSIZE
[fs/lustre-release.git]
/
lustre
/
tests
/
cfg
/
local.sh
diff --git
a/lustre/tests/cfg/local.sh
b/lustre/tests/cfg/local.sh
index
85f6644
..
2acd4ab
100644
(file)
--- a/
lustre/tests/cfg/local.sh
+++ b/
lustre/tests/cfg/local.sh
@@
-7,13
+7,17
@@
mgs_HOST=${mgs_HOST:-$mds_HOST}
ost_HOST=${ost_HOST:-$(hostname)}
ostfailover_HOST=${ostfailover_HOST}
CLIENTS=""
ost_HOST=${ost_HOST:-$(hostname)}
ostfailover_HOST=${ostfailover_HOST}
CLIENTS=""
+# FILESET variable is used by sanity.sh to verify fileset
+# feature, tests should pass even under subdirectory namespace.
+FILESET=${FILESET:-""}
+[[ -z "$FILESET" ]] || [[ "${FILESET:0:1}" = "/" ]] || FILESET="/$FILESET"
TMP=${TMP:-/tmp}
DAEMONSIZE=${DAEMONSIZE:-500}
MDSCOUNT=${MDSCOUNT:-1}
MDSDEVBASE=${MDSDEVBASE:-$TMP/${FSNAME}-mdt}
TMP=${TMP:-/tmp}
DAEMONSIZE=${DAEMONSIZE:-500}
MDSCOUNT=${MDSCOUNT:-1}
MDSDEVBASE=${MDSDEVBASE:-$TMP/${FSNAME}-mdt}
-MDSSIZE=${MDSSIZE:-2
0
0000}
+MDSSIZE=${MDSSIZE:-2
5
0000}
#
# Format options of facets can be specified with these variables:
#
#
# Format options of facets can be specified with these variables:
#
@@
-31,11
+35,15
@@
MDSSIZE=${MDSSIZE:-200000}
MDSOPT=${MDSOPT:-}
MDS_FS_MKFS_OPTS=${MDS_FS_MKFS_OPTS:-}
MDS_MOUNT_OPTS=${MDS_MOUNT_OPTS:-}
MDSOPT=${MDSOPT:-}
MDS_FS_MKFS_OPTS=${MDS_FS_MKFS_OPTS:-}
MDS_MOUNT_OPTS=${MDS_MOUNT_OPTS:-}
+# <facet_type>_MOUNT_FS_OPTS is the mount options specified when formatting
+# the underlying device by argument "--mountfsoptions"
+MDS_MOUNT_FS_OPTS=${MDS_MOUNT_FS_OPTS:-}
MGSSIZE=${MGSSIZE:-$MDSSIZE}
MGSOPT=${MGSOPT:-}
MGS_FS_MKFS_OPTS=${MGS_FS_MKFS_OPTS:-}
MGS_MOUNT_OPTS=${MGS_MOUNT_OPTS:-}
MGSSIZE=${MGSSIZE:-$MDSSIZE}
MGSOPT=${MGSOPT:-}
MGS_FS_MKFS_OPTS=${MGS_FS_MKFS_OPTS:-}
MGS_MOUNT_OPTS=${MGS_MOUNT_OPTS:-}
+MGS_MOUNT_FS_OPTS=${MGS_MOUNT_FS_OPTS:-}
OSTCOUNT=${OSTCOUNT:-2}
OSTDEVBASE=${OSTDEVBASE:-$TMP/${FSNAME}-ost}
OSTCOUNT=${OSTCOUNT:-2}
OSTDEVBASE=${OSTDEVBASE:-$TMP/${FSNAME}-ost}
@@
-43,6
+51,7
@@
OSTSIZE=${OSTSIZE:-400000}
OSTOPT=${OSTOPT:-}
OST_FS_MKFS_OPTS=${OST_FS_MKFS_OPTS:-}
OST_MOUNT_OPTS=${OST_MOUNT_OPTS:-}
OSTOPT=${OSTOPT:-}
OST_FS_MKFS_OPTS=${OST_FS_MKFS_OPTS:-}
OST_MOUNT_OPTS=${OST_MOUNT_OPTS:-}
+OST_MOUNT_FS_OPTS=${OST_MOUNT_FS_OPTS:-}
OST_INDEX_LIST=${OST_INDEX_LIST:-}
# Can specify individual ost devs with
# OSTDEV1="/dev/sda"
OST_INDEX_LIST=${OST_INDEX_LIST:-}
# Can specify individual ost devs with
# OSTDEV1="/dev/sda"
@@
-66,7
+75,7
@@
OST_INDEX_LIST=${OST_INDEX_LIST:-}
# More specific ones override more general ones. See facet_index().
NETTYPE=${NETTYPE:-tcp}
# More specific ones override more general ones. See facet_index().
NETTYPE=${NETTYPE:-tcp}
-MGSNID=${MGSNID:-$(h2
$NETTYPE
$mgs_HOST)}
+MGSNID=${MGSNID:-$(h2
nettype
$mgs_HOST)}
#
# Back end file system type(s) of facets can be specified with these
#
# Back end file system type(s) of facets can be specified with these
@@
-85,13
+94,13
@@
ZFS_MKFS_OPTS=${ZFS_MKFS_OPTS:-}
LOAD_MODULES_REMOTE=${LOAD_MODULES_REMOTE:-false}
LOAD_MODULES_REMOTE=${LOAD_MODULES_REMOTE:-false}
-STRIPE_BYTES=${STRIPE_BYTES:-1048576}
-STRIPES_PER_OBJ=${STRIPES_PER_OBJ:-0}
+DEF_STRIPE_SIZE=${DEF_STRIPE_SIZE:-} # filesystem default stripe size in bytes
+DEF_STRIPE_COUNT=${DEF_STRIPE_COUNT:-} # filesystem default stripe count
SINGLEMDS=${SINGLEMDS:-"mds1"}
TIMEOUT=${TIMEOUT:-20}
PTLDEBUG=${PTLDEBUG:-"vfstrace rpctrace dlmtrace neterror ha config \
ioctl super lfsck"}
SINGLEMDS=${SINGLEMDS:-"mds1"}
TIMEOUT=${TIMEOUT:-20}
PTLDEBUG=${PTLDEBUG:-"vfstrace rpctrace dlmtrace neterror ha config \
ioctl super lfsck"}
-SUBSYSTEM=${SUBSYSTEM:-"all
-lnet -lnd -pinger
"}
+SUBSYSTEM=${SUBSYSTEM:-"all"}
# promise 2MB for every cpu
if [ -f /sys/devices/system/cpu/possible ]; then
# promise 2MB for every cpu
if [ -f /sys/devices/system/cpu/possible ]; then
@@
-141,7
+150,7
@@
POWER_UP=${POWER_UP:-"powerman --on"}
SLOW=${SLOW:-no}
FAIL_ON_ERROR=${FAIL_ON_ERROR:-true}
SLOW=${SLOW:-no}
FAIL_ON_ERROR=${FAIL_ON_ERROR:-true}
-MPIRUN=$
(which mpirun 2>/dev/null) || true
+MPIRUN=$
{MPIRUN:-$(which mpirun 2>/dev/null || true)}
MPI_USER=${MPI_USER:-mpiuser}
SHARED_DIR_LOGS=${SHARED_DIR_LOGS:-""}
MACHINEFILE_OPTION=${MACHINEFILE_OPTION:-"-machinefile"}
MPI_USER=${MPI_USER:-mpiuser}
SHARED_DIR_LOGS=${SHARED_DIR_LOGS:-""}
MACHINEFILE_OPTION=${MACHINEFILE_OPTION:-"-machinefile"}