X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fscripts%2Fbdev-io-survey.sh;h=084ca5a810fc21d1fb94b06e865896edd35f9ba6;hb=0607e01af74a81d0fe12ceec79bd22810a5dfe92;hp=e55d0ba183ee8038327ae0a3f3967c2a112cb841;hpb=29e3b785b6e1e373d72055e58d364fa170df3b8a;p=fs%2Flustre-release.git

diff --git a/lustre/scripts/bdev-io-survey.sh b/lustre/scripts/bdev-io-survey.sh
index e55d0ba..084ca5a 100755
--- a/lustre/scripts/bdev-io-survey.sh
+++ b/lustre/scripts/bdev-io-survey.sh
@@ -12,6 +12,7 @@
 #	discard first vmstat line
 #
 
+HOSTNAME=`hostname`
 # a temp dir that is setup and torn down for each script run
 tmpdir=""
 # so we can kill background processes as the test cleans up
@@ -22,6 +23,9 @@ declare -a cleanup_mounts
 cur_y="0"
 # a global which funcs use to get at the blocks[] array
 last_block=-1
+# prefix to run oprofile or readprofile
+oprofile=""
+readprofile=""
 
 # defaults for some options:
 min_threads=1
@@ -226,7 +230,7 @@ sgp_dd_start() {
 	local bdev=${blocks[$i]};
 
 	case "$wor" in
-		w) ifof="if=/dev/zero of=$bdev" ;;
+		[wo]) ifof="if=/dev/zero of=$bdev" ;;
 		r) ifof="if=$bdev of=/dev/null" ;;
 		*) die "asked to do io with $wor?"
 	esac
@@ -302,7 +306,7 @@ ext2_iozone_setup() {
 
 	case "$wor" in
 		w) rm -f $f ;;
-		r) ;;
+		[or]) ;;
 		*) die "asked to do io with $wor?"
 	esac
 }
@@ -315,7 +319,7 @@ ext2_iozone_start() {
 	local f="$tmpdir/mount_$id/iozone"
 
 	case "$wor" in
-		w) args="-i 0 -w" ;;
+		[wo]) args="-i 0 -w" ;;
 		r) args="-i 1" ;;
 		*) die "asked to do io with $wor?"
 	esac
@@ -330,7 +334,7 @@ ext2_iozone_result() {
 	local field
 
 	case "$wor" in
-		w) string="writers" 
+		[wo]) string="writers" 
 		   field=7 
 			;;
 		r) string="readers" 
@@ -418,14 +422,14 @@ echo_filter_config() {
 	fi
 
 	if [ $index = 0 ]; then
-		if ! lmc -m $config --add net  \
-			--node localhost --nid localhost --nettype tcp; then
-			echo "error adding localhost net node"
+		if ! lmc -m $config --add net \
+			--node $HOSTNAME --nid $HOSTNAME --nettype tcp; then
+			echo "error adding $HOSTNAME net node"
 			return 1
 		fi
 	fi
 
-	if ! lmc -m $config --add ost --ost ost_$index --node localhost \
+	if ! lmc -m $config --add ost --ost ost_$index --node $HOSTNAME \
 			--fstype ext3 --dev $bdev --journal_size 400; then
 		echo "error adding $bdev to config with lmc"
 		return 1
@@ -447,6 +451,10 @@ echo_filter_prepare() {
 			return 1;
 		fi
 		running_config="$config"
+
+		echo 0 > /proc/sys/lnet/debug
+		echo 0 > /proc/sys/lnet/subsystem_debug
+
 		if ! grep -q '^obdecho\>' /proc/modules; then
 			local m
 			if ! modprobe obdecho; then
@@ -489,7 +497,7 @@ echo_filter_setup() {
 
 	case "$wor" in
 		w) ;;
-		r) return ;;
+		[or]) return ;;
 		*) die "asked to do io with $wor?"
 	esac
 
@@ -504,19 +512,20 @@ echo_filter_start() {
 	local iosize=$2
 	local wor=$3
 	local id=$4
+	local rw
 
 	local name="echo_$id"
 	local len_pages=$(($io_len / $(($page_size / 1024)) / $threads ))
 	local size_pages=$(($iosize / $(($page_size / 1024)) ))
 
 	case "$wor" in
-		w) ;;
-		r) ;;
+		[wo]) rw="w" ;;
+		r) rw="r" ;;
 		*) die "asked to do io with $wor?"
 	esac
 
 	echo lctl --threads $threads v "\$"$name \
-		test_brw 1 $wor v $len_pages t${running_oids[$id]} p$size_pages
+		test_brw 1 $rw v $len_pages t${running_oids[$id]} p$size_pages
 }
 echo_filter_result() {
 	local output=$1
@@ -535,7 +544,7 @@ echo_filter_cleanup() {
 	local name="echo_$id"
 
 	case "$wor" in
-		w) return ;;
+		[wo]) return ;;
 		r) ;;
 		*) die "asked to do io with $wor?"
 	esac
@@ -578,6 +587,8 @@ test_one() {
 
 	echo $test with $threads threads
 
+	$oprofile opcontrol --start
+
 	# start up vmstat and record its pid
         nice -19 vmstat 1 > $vmstat_log 2>&1 &
 	[ $? = 0 ] || die "vmstat failed"
@@ -594,10 +605,14 @@ test_one() {
 		iostat_pids[$i]=$pid
 	done
 
+	$oprofile opcontrol --reset
+	$readprofile -r
+
 	# start all the tests.  each returns a pid to wait on
 	pids=""
 	for i in `seq 0 $last_block`; do
 		local cmd=`${test}_start $threads $iosize $wor $i`
+		echo "$cmd" >> $tmpdir/commands
 		$cmd > $tmpdir/$i 2>&1 &
 		local pid=$!
 		pids="$pids $pid"
@@ -623,6 +638,16 @@ test_one() {
 		pid_has_stopped $pid
 	done
 
+	$readprofile | sort -rn > $tmpdir/readprofile
+
+	$oprofile opcontrol --shutdown
+	$oprofile opreport > $tmpdir/oprofile
+	echo >> $tmpdir/oprofile
+	$oprofile opreport -c -l | head -20 >> $tmpdir/oprofile
+
+	save_output $tmpdir/oprofile $opref.oprofile
+	save_output $tmpdir/readprofile $opref.readprofile
+
 	# collect the results of vmstat and iostat
 	cpu=$(mean_stddev $(awk \
 	      '(NR > 3 && NF == 16 && $16 != "id" )	\
@@ -711,7 +736,7 @@ test_iterator() {
 			table_set $test 0 $cur_y $thr
 			table_set $test 1 $cur_y $iosize
 
-			for wor in w r; do
+			for wor in w o r; do
 				table_set $test 2 $cur_y $wor
 				test_one $test 3 $thr $iosize $wor
 			done
@@ -756,8 +781,10 @@ if [ -z "$io_len" ]; then
 fi
 
 if [ ! -z "$output_dir" ]; then
-	[ ! -e "$output_dir" ] && "output dir $output_dir doesn't exist"
-	[ ! -d "$output_dir" ] && "output dir $output_dir isn't a directory"
+	if [ ! -e "$output_dir" ]; then
+		 mkdir -p "$output_dir" || die  "error creating $output_dir"
+	fi
+	[ ! -d "$output_dir" ] && die "$output_dir isn't a directory"
 fi
 
 block=`echo $block | sed -e 's/,/ /g'`
@@ -771,6 +798,26 @@ for t in $run_tests; do
 	fi
 done
 
+if which opcontrol; then
+        echo generating oprofile results
+        oprofile=""
+else
+        echo not using oprofile
+        oprofile=": "
+fi
+
+if which readprofile; then
+	map="/boot/System.map-`uname -r`"
+	if [ -f /proc/profile -a -f "$map" ]; then
+		echo generating profiles with 'readprofile'
+		readprofile="readprofile -m $map"
+	fi
+fi
+if [ -z "$readprofile" ]; then
+	echo not using readprofile
+	readprofile=": "
+fi
+
 [ $min_threads -gt $max_threads ] && \
 	die "min threads $min_threads must be <= min_threads $min_threads"
 
@@ -811,11 +858,14 @@ for t in $run_tests; do
 	test_results="$test_results $t"
 done
 
+save_output $tmpdir/commands commands
+
 [ ! -z "$test_results" ] && (
 	echo
 	echo "T = number of concurrent threads per device"
 	echo "L = base io operation length, in KB"
 	echo "m = IO method: read, write, or over-write"
+	echo "A = aggregate throughput from all devices"
 	echo "C = percentage CPU used, both user and system"
 	echo "MB/s = per-device throughput"
 	echo "rR = read requests issued to the device per second"