[Swift-commit] r7833 - in trunk: bin docs/userguide

[davidk at ci.uchicago.edu]

Author: davidk
Date: 2014-05-07 10:06:39 -0500 (Wed, 07 May 2014)
New Revision: 7833

Modified:
   trunk/bin/swiftrun
   trunk/docs/userguide/configuration
Log:
Add and document site property stagingMethod


Modified: trunk/bin/swiftrun
===================================================================
--- trunk/bin/swiftrun	2014-05-07 15:04:37 UTC (rev 7832)
+++ trunk/bin/swiftrun	2014-05-07 15:06:39 UTC (rev 7833)
@@ -51,6 +51,7 @@
    'providerattributes'        => 'globus.providerAttributes',
    'remotemonitorenabled'      => 'globus.remoteMonitorEnabled',
    'slurm'                     => 'globus.slurm',
+   'stagingmethod'             => 'swift.stagingMethod',
    'taskdir'                   => 'globus.scratch',
    'tasksperworker'            => 'globus.jobsPerNode',
    'taskthrottle'              => 'karajan.jobThrottle',

Modified: trunk/docs/userguide/configuration
===================================================================
--- trunk/docs/userguide/configuration	2014-05-07 15:04:37 UTC (rev 7832)
+++ trunk/docs/userguide/configuration	2014-05-07 15:06:39 UTC (rev 7833)
@@ -227,6 +227,16 @@
 the line "#SBATCH --mail-user=username".
 |site.midway.slurm.mail-user=username
 
+|stagingMethod
+|When provider staging is enabled, this option will specify the staging mechanism for
+use for each site. If set to 'file', staging is done from a filesystem accessible to 
+the coaster service (typically running on the head node). If set to 'proxy', staging 
+is done from a filesystem accessible to the client machine that swift is running on, 
+and is proxied through the coaster service. If set to 'sfs' (short for "shared filesystem"),
+staging is done by copying files to and from a filesystem accessible by the compute node 
+(such as an NFS or GPFS mount)
+|site.osg.stagingMethod=file
+
 |taskDir
 |Tasks will be run from this directory. In the absence of a taskDir definition, 
 Swift will run the task from workdir.