[Swift-commit] r8060 - trunk/resources
yadunandb at ci.uchicago.edu
yadunandb at ci.uchicago.edu
Wed Jul 23 17:08:50 CDT 2014
Author: yadunandb
Date: 2014-07-23 17:08:50 -0500 (Wed, 23 Jul 2014)
New Revision: 8060
Modified:
trunk/resources/swift.conf.schema
Log:
I removed trailing whitespaces, so the diff will be very noisy.
Added following ec2 joboption configs:
All of the following are currenly required, but could be made optional later
ec2CredentialsFile : This is the credentials file you download from the IAM page
ec2SecurityGroup : Name of the security group. [could be optional later]
ec2KeypairName : Name of the keypair to use [could be optional later]
ec2KeypairFile : Path to the keypair file, a .pem file.
ec2WorkerImage : Any Amazon machine image, usually starts with ami-<ID>
ec2WorkerType : Instance type, such as t1.micro, c3.large etc
Modified: trunk/resources/swift.conf.schema
===================================================================
--- trunk/resources/swift.conf.schema 2014-07-21 19:39:16 UTC (rev 8059)
+++ trunk/resources/swift.conf.schema 2014-07-23 22:08:50 UTC (rev 8060)
@@ -2,20 +2,20 @@
app."*" {
_doc:
""" Defines an application global to all sites. The '*' symbol stands for
- the name of the application, as would appear in a swift script. The string
+ the name of the application, as would appear in a swift script. The string
ALL could be used to provide settings that apply to all applications."""
-
+
executable {
_type: "?String"
- _doc:
- """ Specifies the executable of an application. Can either be an absolute
+ _doc:
+ """ Specifies the executable of an application. Can either be an absolute
path or and executable name that must be in the system PATH on the target
- site or the symbol "*", in which case Swift will attempt to run an
- executable with the same name as the application"""
+ site or the symbol "*", in which case Swift will attempt to run an
+ executable with the same name as the application"""
}
-
+
maxWallTime: "?Time"
-
+
options {
_type: "?Object"
_doc:
@@ -34,9 +34,9 @@
ppn: "?StrictlyPositiveInt"
pbs.properties: "?String"
condor: "?Object"
- "*": "?Object"
- }
-
+ "*": "?Object"
+ }
+
env."*": "String"
}
@@ -47,16 +47,16 @@
_type: "?StrictlyPositiveInt"
_default: 2
}
-
- initialParallelTasks {
+
+ initialParallelTasks {
_type: "?StrictlyPositiveInt"
_default: 2
}
-
+
delayBase {
_type: "?Float"
}
-
+
maxSubmitRate {
_type: "?PositiveFloat"
}
@@ -65,7 +65,7 @@
_type: "?Choice[swift, wrapper, local, service-local, shared-fs]"
_default: "swift"
}
-
+
filesystem {
_type: "?Object"
type: "String"
@@ -75,7 +75,7 @@
}
options: "?Object"
}
-
+
execution {
type: "String"
URL: "?String"
@@ -110,17 +110,23 @@
ppn: "?StrictlyPositiveInt"
pbs.properties: "?String"
condor: "?Object"
+ ec2CredentialsFile: "?String"
+ ec2SecurityGroup: "?String"
+ ec2KeypairName: "?String"
+ ec2KeypairFile: "?String"
+ ec2WorkerImage: "?String"
+ ec2WorkerType: "?String"
}
}
}
-
+
workDirectory: "String"
scratch: "?String"
-
+
app."*": {
executable: "?String"
maxWallTime: "?Time"
-
+
options {
# known things
jobType: "?String"
@@ -136,16 +142,16 @@
condor: "?Object"
"*": "?Object"
}
-
+
env."*": "String"
}
-
+
wrapperInterpreter: "?String"
wrapperInterpreterOptions: "?StringList"
wrapperScript: "?String"
cleanupCommand: "?String"
cleanupCommandOptions: "?StringList"
-
+
# Global properties that can also be used for individual sites
wrapperParameterMode: "?Choice[args, files]"
keepSiteDir: "?Boolean"
@@ -156,7 +162,7 @@
_type: "StringList"
_doc:
"""Selects a list of sites to run on. The sites in question must have been defined
- using the site.* properties. To get a list of sites defined in the current
+ using the site.* properties. To get a list of sites defined in the current
configuration, start swift with the -sitelist command line option"""
}
@@ -168,9 +174,9 @@
lazyErrors {
_type: "?Boolean"
_default: false
- _doc:
+ _doc:
"""Use a lazy mode to deal with errors. When set to 'true' Swift will proceed with the
- execution until no more data can be derived because of errors in dependent steps. If
+ execution until no more data can be derived because of errors in dependent steps. If
set to 'false', an error will cause the execution to immediately stop"""
}
@@ -178,8 +184,8 @@
_type: "?PositiveInt"
_default: 0
_doc:
- """The number of time an application invocation will be retried if it fails until Swift
- finally gives up and declares it failed. The total number of attempts will be 1 +
+ """The number of time an application invocation will be retried if it fails until Swift
+ finally gives up and declares it failed. The total number of attempts will be 1 +
executionRetries."""
}
@@ -192,12 +198,12 @@
_type: "?Throttle"
_default: 4
_doc:
- """Limits the number of jobs that can concurrently be in the process of being
+ """Limits the number of jobs that can concurrently be in the process of being
submitted, that is in the "Submitting" state. This is the state where the job
- information is being communicated to a remote service. Certain execution
- mechanisms may become inefficient if too many jobs are being submitted
- concurrently and there are no benefits to parallelizing submission beyond a
- certain point. Please not that this does not apply to the number of jobs that
+ information is being communicated to a remote service. Certain execution
+ mechanisms may become inefficient if too many jobs are being submitted
+ concurrently and there are no benefits to parallelizing submission beyond a
+ certain point. Please not that this does not apply to the number of jobs that
can be active concurrently."""
}
@@ -211,8 +217,8 @@
fileTransfersThrottle {
_type: "?Throttle"
_default: 4
- _doc:
- """Limits the number of concurrent file transfers when file staging is set to
+ _doc:
+ """Limits the number of concurrent file transfers when file staging is set to
"swift". Arbitrarily increasing file transfer parallelism leads to little
benefits as the throughput approaches the maximum avaiable network bandwidth.
Instead it can lead to an increase in latencies which may increase the chances
@@ -225,7 +231,7 @@
_doc:
"""Limits the number of concurrent file operations that can be active at a given
time when file staging is set to "swift". File operations are defined to be all
- remote operations on a filesystem that exclude file transfers. Examples are:
+ remote operations on a filesystem that exclude file transfers. Examples are:
listing the contents of a directory, creating a directory, removing a file, etc."""
}
@@ -253,11 +259,11 @@
_type: "?Boolean"
_default: false
_doc:
- """If enabled, jobs that are queued longer than a certain amount of time will
- have a duplicate version re-submitted. This process will continue until a
- maximum pre-set number of such replicas is queued. When one of the replicas
- becomes active, all other replicas are canceled. This mechanism can potentially
- prevent a single overloaded site from completely blocking a run."""
+ """If enabled, jobs that are queued longer than a certain amount of time will
+ have a duplicate version re-submitted. This process will continue until a
+ maximum pre-set number of such replicas is queued. When one of the replicas
+ becomes active, all other replicas are canceled. This mechanism can potentially
+ prevent a single overloaded site from completely blocking a run."""
}
replicationMinQueueTime {
@@ -298,7 +304,7 @@
CDMFile {
_type: "?String"
_default: "fs.data"
- _doc:
+ _doc:
"""Specifies which Collective Data Management file to use"""
}
@@ -313,7 +319,7 @@
_doc:
"""Specifies the date/time format to use for the time stamp of each ticker
line. It must conform to Java's SimpleDataFormat syntax."""
-
+
}
tickerPrefix {
@@ -335,8 +341,8 @@
_type: "?Boolean"
_default: true
_doc:
- """Controls the file garbage collector. If set to false, files mapped by
- collectable mappers (such as the concurrent mapper) will not be deleted when their
+ """Controls the file garbage collector. If set to false, files mapped by
+ collectable mappers (such as the concurrent mapper) will not be deleted when their
Swift variables go out of scope."""
}
@@ -344,18 +350,18 @@
_type: "?Boolean"
_default: true
_doc:
- """Controls the run-time duplicate mapping checker (which indetifies mapping
- conflicts). When enabled, a record of all mapped data is kept, so this comes at the
- expense of a slight memory leak. If set 'false', the mapping checker is disabled.
+ """Controls the run-time duplicate mapping checker (which indetifies mapping
+ conflicts). When enabled, a record of all mapped data is kept, so this comes at the
+ expense of a slight memory leak. If set 'false', the mapping checker is disabled.
Enabled by default."""
}
hostName {
_type: "?String"
_default: null
- _doc:
- """Can be used to specify a publicly reacheable DNS name or IP address for this
- machine which is generally used for Globus or Coaster callbacks. Normally this should be
+ _doc:
+ """Can be used to specify a publicly reacheable DNS name or IP address for this
+ machine which is generally used for Globus or Coaster callbacks. Normally this should be
auto-detected, but if you do not have a public DNS name, you may want to set this."""
}
@@ -363,9 +369,9 @@
_type: "?PortRange"
_default: null
_doc:
- """A TCP port range can be specified to restrict the ports on which certain callback
- services are started. This is likely needed if your submit host is behind a firewall,
- in which case the firewall should be configured to allow incoming connections on
+ """A TCP port range can be specified to restrict the ports on which certain callback
+ services are started. This is likely needed if your submit host is behind a firewall,
+ in which case the firewall should be configured to allow incoming connections on
ports in this range."""
}
@@ -373,7 +379,7 @@
_type: "?Boolean"
_default: false
_doc:
- """Controls when wrapper logs are transfered back to the submit host. If set to
+ """Controls when wrapper logs are transfered back to the submit host. If set to
"false", Swift will only transfer a wrapper log for a given job when that job fails.
If set to "true", Swift will transfer wrapper logs whether a job fails or not."""
}
@@ -382,9 +388,9 @@
_type: "?Boolean"
_default: false
_doc:
- """Enables execution tracing. If set to "true", operations within Swift such as
- iterations, invocations, assignments, and declarations, as well as data dependencies
- will be logged. This comes at a cost in performance. It is therefore disabled by
+ """Enables execution tracing. If set to "true", operations within Swift such as
+ iterations, invocations, assignments, and declarations, as well as data dependencies
+ will be logged. This comes at a cost in performance. It is therefore disabled by
default."""
}
More information about the Swift-commit
mailing list