Merge pull request #44 from fscheiner/master

Pull gtransfer v0.6.0RC1
fr4nk5ch31n3r · Jun 30, 2016 · d703fc9 · d703fc9
2 parents 12e5d18 + b91239f
commit d703fc9
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 7 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,16 @@
+2016-06-30  Frank Scheiner <[email protected]>
+
+*0.6.0 (gtransfer toolkit):
+
+- New functionality
+
+The stall timeout setting for globus-url-copy is now configurable via
+the gtransfer configuration file or from a dparam. If not configured in
+a dparam, the setting from the gtransfer configuration file is used. The
+old hard-coded default of 30 seconds is not necessarily suitable for
+data transfers from sites which first need to stage in files from e.g.
+tape before a data transfer can begin (e.g. sites using HPSS).
+
 2016-04-12  Frank Scheiner <[email protected]>
 
 *0.5.1 (gtransfer toolkit):

diff --git a/bin/gtransfer-version.bash b/bin/gtransfer-version.bash
@@ -5,7 +5,7 @@
 
 :<<COPYRIGHT
 
-Copyright (C) 2014-2015 Frank Scheiner, HLRS, Universitaet Stuttgart
+Copyright (C) 2014-2016 Frank Scheiner, HLRS, Universitaet Stuttgart
 
 The program is distributed under the terms of the GNU General Public License
 
@@ -29,7 +29,7 @@ COPYRIGHT
 ################################################################################
 
 readonly _program=$( basename "$0" )
-readonly _gtransferToolkitVersion="0.5.1"
+readonly _gtransferToolkitVersion="0.6.0"
 
 readonly _gtransferTools=( "gtransfer"
 			   "dpath"

diff --git a/bin/gtransfer.bash b/bin/gtransfer.bash
@@ -37,7 +37,7 @@ trap - SIGINT
 #set -f
 
 readonly _program=$( basename "$0" )
-readonly _gtransferVersion="0.5.1"
+readonly _gtransferVersion="0.6.0"
 
 version="$_gtransferVersion"
 

diff --git a/etc/gtransfer/gtransfer.conf b/etc/gtransfer/gtransfer.conf
@@ -62,5 +62,8 @@ __GLOBAL__checkConnection=1
 # details)
 __GLOBAL__scanPortTimeout=2
 
+# Timeout setting for guc option `-stall-timeout` in seconds
+__CONFIG__stallTimeout=30
+
 ################################################################################
 
diff --git a/gtransfer.spec b/gtransfer.spec
@@ -1,5 +1,5 @@
 Name:		gtransfer
-Version:	0.5.0
+Version:	0.6.0
 Release:	1%{?dist}
 Summary:	Advanced data transfer tool for GridFTP
 Group:		base
@@ -170,6 +170,9 @@ rm -rf %{buildroot}
 %{_mandir}/man1/halias.1.gz
 
 %changelog
+* Thu Jun 30 2016 Frank Scheiner <[email protected]> 0.6.0-1
+- Updated source package and version number to new release.
+
 * Thu Apr 12 2016 Frank Scheiner <[email protected]> 0.5.1-1
 - Updated source version number to new patch level.
 

diff --git a/lib/gtransfer/listTransfer.bashlib b/lib/gtransfer/listTransfer.bashlib
@@ -27,7 +27,7 @@ COPYRIGHT
 #  DEFINES
 ################################################################################
 
-readonly _listTransfer_Version="0.7.0"
+readonly _listTransfer_Version="0.8.0"
 
 ################################################################################
 #  INCLUDES
@@ -1153,7 +1153,13 @@ listTransfer/createTgftpTransferCommand()
 
 		_gucReliabilityOptions=""
 	else
-		_gucReliabilityOptions="-restart -rst-retries $gucMaxRetries -dumpfile $dumpfileName -stall-timeout 30"
+		# NOTICE: Don't forget to escape "-" when using grep!
+		if echo "$gsiftpParams" | grep '\-stall\-timeout' &>/dev/null; then
+
+			_gucReliabilityOptions="-restart -rst-retries $gucMaxRetries -dumpfile $dumpfileName"
+		else
+			_gucReliabilityOptions="-restart -rst-retries $gucMaxRetries -dumpfile $dumpfileName -stall-timeout $__CONFIG__stallTimeout"
+		fi
 		# Filter "-pp" from "gsiftpParams", as pipelining and reliability don't
 		# work well in conjunction.
 		#

diff --git a/share/doc/host-aliases.md b/share/doc/host-aliases.md
@@ -87,7 +87,7 @@ substitution.
 This uses the same mapping as the file above and will be expanded the same way.
 
 ```
-$ ls -1 aliases.d
+$ ls -1 aliases
 alias1:
 myGridFTP:
 alias3: