Make test script aware of new AXL Service transfer type

Author: mcfadden8

test/test_axl.sh

@@ -8,11 +8,14 @@
 function usage
 {
 echo "
- Usage: test_axl [-c sec [-k]] [-n num_files] [xfer_type]
+ Usage: test_axl [-s src_dir] [-d dst_dir ] [-c sec [-k]] [-n num_files] [-p num_bytes] [-S host:port] [xfer_type]
 
    -c sec:          Cancel transfer after 'sec' seconds (can be decimal number)
+   -s src_dir:      Source directory (typically where SCR cache files are kept)
+   -d dst_dir:      Destination directory (typically a shared parallel file system directory)
    -n num_files:    Number of files to create (default 50)
    -p bytes:        Pause the transfer after $bytes bytes
+   -S host:port:    Hostname:Portnum of where AXL Service is listening
    -U:              After starting the transfer, kill -9 it, and resume it
    xfer_type:       sync|pthread|bbapi|dw|state_file (defaults to sync if none specified)
 "
@@ -23,7 +26,20 @@ function isnum
 	[[ "$1" =~ ^[0-9.]+$ ]]
 }
 
-while getopts "c:kn:p:U" opt; do
+function run_cmd
+{
+    echo $1
+    if ! eval $1 ; then
+        echo "Command Failed"
+        exit 1
+    fi
+}
+
+
+src_dir=""
+dst_dir=""
+
+while getopts "c:d:kn:p:s:S:U" opt; do
 	case "${opt}" in
 	c)
 		sec=${OPTARG}
@@ -33,6 +49,12 @@ while getopts "c:kn:p:U" opt; do
 			exit 1
 		fi
 		;;
+	s)
+		src_dir=${OPTARG}
+		;;
+	d)
+		dst_dir=${OPTARG}
+		;;
 	n)
 		num_files=${OPTARG}
 		if ! isnum $num_files ; then
@@ -50,9 +72,18 @@ while getopts "c:kn:p:U" opt; do
 		fi
 		;;
 
-	U)
-		resume=1
+	S)
+		host_name=${OPTARG%:*}
+		port_num=${OPTARG#*:}
+		if ! isnum $port_num ; then
+			echo "'$port_num' is not a number"
+			usage
+			exit
+		fi
 		;;
+
+	U)
+		resume=1 ;;
 	*)
 		usage
 		exit
@@ -70,20 +101,32 @@ case $xfer in
 	pthread) ;;
 	bbapi) ;;
 	dw) ;;
+	axlservice) ;;
+	# nnfdm) ;;
 	*)
 		echo "Invalid transfer type '$xfer'"
+		usage
 		exit 1;
 	;;
 esac
 
-src=$(mktemp -d)
-dest=$(mktemp -d)
+function create_tmpdir
+{
+	if [ -z "${1}" ] ; then
+		mktemp -d
+	else
+		mktemp -p ${1} -d
+	fi	
+}
+
+src=$(create_tmpdir ${src_dir})
+dest=$(create_tmpdir ${dst_dir})
 
 trap ctrl_c INT
 
 function cleanup
 {
-	rm -fr "$src" "$dest"
+	run_cmd "rm -fr ${src} ${dest}"
 }
 
 function ctrl_c() {
@@ -107,8 +150,10 @@ function create_files {
 	for ((i=0; i < $num; i++)) ; do
 		dirnum=$(($i % $num_dirs))
 		tmp="$src/${dirs[$dirnum]}"
-		dd if=/dev/zero of="$tmp/$i.file" bs=1k count=$i &>/dev/null
+		dd if=/dev/zero of="$tmp/$i.file" bs=1M count=$((i+1)) &>/dev/null
 	done
+	tree -h $src
+	tree -h $dest
 }
 
 # $1 Transfer type
@@ -191,6 +236,8 @@ if ! run_test $xfer $sec $pause_after $resume ; then
 	cleanup
 	exit 1
 else
+	tree -h $src
+	tree -h $dest
 	# Files are copied, verify they're all there and correct
 	if ! out2="$(diff -qr $src $dest)" ; then
 		# Files aren't all there.  If we canceled the transfer this is