<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
<meta content="text/html;charset=UTF-8" http-equiv="Content-Type">
<title></title>
</head>
<body bgcolor="#ffffcc" text="#000066">
<pre wrap="">Signed-off-by: Marcos Matsunaga <a class="moz-txt-link-rfc2396E" href="mailto:Marcos.Matsunaga@oracle.com"><Marcos.Matsunaga@oracle.com></a></pre>
<pre class="moz-signature" cols="72">Regards,
Marcos Eduardo Matsunaga
Oracle USA
Linux Engineering
“The statements and opinions expressed here are my own and do not
necessarily represent those of Oracle Corporation.”
</pre>
<br>
<br>
Tristan Ye wrote:
<blockquote
cite="mid:1251973817-6175-1-git-send-email-tristan.ye@oracle.com"
type="cite">
<pre wrap="">As we know, resize_test is a single-node testcase, therefore, it's no reason to
call remote_mount/remote_umount from multi-nodes which make things confusing.
Signed-off-by: Tristan Ye <a class="moz-txt-link-rfc2396E" href="mailto:tristan.ye@oracle.com"><tristan.ye@oracle.com></a>
---
programs/resize_test/resize_test.sh | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/programs/resize_test/resize_test.sh b/programs/resize_test/resize_test.sh
index 99adf3c..26129fe 100755
--- a/programs/resize_test/resize_test.sh
+++ b/programs/resize_test/resize_test.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# resize_test -c -o <outdir> -d <device> -i <iters> -l <label> -m <mntdir> -n <nodelist>
+# resize_test -c -o <outdir> -d <device> -i <iters> -l <label> -m <mntdir>
#
# Requires the device to be formatted with enough space
# left over to extend the device in <iters> chunks of
@@ -14,14 +14,13 @@ fi
PATH=$PATH:/sbin:${BINDIR} # Add /sbin to the path for ocfs2 tools
usage() {
- echo "usage: resize_test.sh -c -o <outdir> -d <device> -i <iters> -l <label> -m <mntdir> -n <nodelist>"
+ echo "usage: resize_test.sh -c -o <outdir> -d <device> -l <label> -i <iters> -m <mntdir>"
echo " -i number of resize iterations"
echo " -o output directory for the logs"
echo " -d device"
+ echo " -l label"
echo " -c consume space after resize"
- echo " -l volume label for remote mount and umount"
echo " -m mount dir for moutn and umount"
- echo " -n node list for mount and umount"
exit 1;
}
@@ -69,7 +68,7 @@ get_partsz() {
do_mount() {
# mount the device
echo -n "mount "
- $REMOTE_MOUNT -m ${mntdir} -l ${label} -n ${nodelist} >/dev/null 2>&1
+ $MOUNT_BIN ${device} ${mntdir} >/dev/null 2>&1
if [ $? -ne 0 ]
then
echo -n "FAILED. Check dmesg for errors." 2>&1
@@ -83,7 +82,7 @@ do_mount() {
do_umount() {
# umount the volume
echo -n "umount "
- $REMOTE_UMOUNT -m ${mntdir} -n ${nodelist} >/dev/null 2>&1
+ ${UMOUNT_BIN} ${mntdir} >/dev/null 2>&1
if [ $? -ne 0 ]
then
echo "FAILED. Check dmesg for errors." 2>&1
@@ -376,24 +375,22 @@ DATE=`which date`
CHOWN_BIN=`which chown`
CHMOD_BIN=`which chmod`
SUDO="`which sudo` -u root"
-REMOTE_MOUNT=`which remote_mount.py`
-REMOTE_UMOUNT=`which remote_umount.py`
+MOUNT_BIN="`which sudo` -u root `which mount.ocfs2`"
+UMOUNT_BIN="`which sudo` -u root `which umount`"
outdir=
device=
-nodelist=
label=
iters=0
consume=0
OPTIND=1
-while getopts "d:i:o:l:m:n:c" args
+while getopts "d:i:o:m:l:c" args
do
case "$args" in
o) outdir="$OPTARG";;
d) device="$OPTARG";;
i) iters="$OPTARG";;
m) mntdir="$OPTARG";;
- n) nodelist="$OPTARG";;
l) label="$OPTARG";;
c) consume=1;
esac
</pre>
</blockquote>
</body>
</html>