toil 6.1.0a1__py3-none-any.whl → 8.0.0__py3-none-any.whl

toil/utils/toilLaunchCluster.py

@@ -15,106 +15,189 @@
 
 import logging
 import os
-from typing import Dict, List, Tuple, Union
+from typing import Union
 
 from toil import applianceSelf
 from toil.common import parser_with_common_options
-from toil.lib.aws import build_tag_dict_from_env
-from toil.provisioners import (check_valid_node_types,
-                               cluster_factory,
-                               parse_node_types)
+
+try:
+    from toil.lib.aws import build_tag_dict_from_env
+except ModuleNotFoundError:
+    build_tag_dict_from_env: dict[str, str] = lambda _: {}  # type: ignore[no-redef]
+from toil.lib.conversions import opt_strtobool
+from toil.provisioners import check_valid_node_types, cluster_factory, parse_node_types
 from toil.statsAndLogging import set_logging_from_options
 
 logger = logging.getLogger(__name__)
 
 
-def create_tags_dict(tags: List[str]) -> Dict[str, str]:
+def create_tags_dict(tags: list[str]) -> dict[str, str]:
     tags_dict = dict()
     for tag in tags:
-        key, value = tag.split('=')
+        try:
+            key, value = tag.split("=")
+        except ValueError:
+            logger.error("Tag specification '%s' must contain '='", tag)
+            raise
         tags_dict[key] = value
     return tags_dict
 
 
 def main() -> None:
-    parser = parser_with_common_options(provisioner_options=True, jobstore_option=False, prog="toil launch-cluster")
-    parser.add_argument("-T", "--clusterType", dest="clusterType",
-                        choices=['mesos', 'kubernetes'],
-                        default=None,  # TODO: change default to "kubernetes" when we are ready.
-                        help="Cluster scheduler to use.")
-    parser.add_argument("--leaderNodeType", dest="leaderNodeType", required=True,
-                        help="Non-preemptible node type to use for the cluster leader.")
-    parser.add_argument("--keyPairName", dest='keyPairName',
-                        help="On AWS, the name of the AWS key pair to include on the instance."
-                        " On Google/GCE, this is the ssh key pair.")
-    parser.add_argument("--owner", dest='owner',
-                        help="The owner tag for all instances. If not given, the value in"
-                        "TOIL_OWNER_TAG will be used, or else the value of --keyPairName.")
-    parser.add_argument("--boto", dest='botoPath',
-                        help="The path to the boto credentials directory. This is transferred "
-                        "to all nodes in order to access the AWS jobStore from non-AWS instances.")
-    parser.add_argument("-t", "--tag", metavar='NAME=VALUE', dest='tags',
-                        default=[], action='append',
-                        help="Tags are added to the AWS cluster for this node and all of its "
-                             "children. Tags are of the form:\n"
-                             " -t key1=value1 --tag key2=value2\n"
-                             "Multiple tags are allowed and each tag needs its own flag. By "
-                             "default the cluster is tagged with "
-                             " {\n"
-                             "      \"Name\": clusterName,\n"
-                             "      \"Owner\": IAM username\n"
-                             " }. ")
-
-    parser.add_argument("--network",
-                        help="GCE cloud network to use. default: 'default'")
-    parser.add_argument("--vpcSubnet",
-                        help="VPC subnet ID to launch cluster leader in. Uses default subnet "
-                        "if not specified. This subnet needs to have auto assign IPs turned on.")
-    parser.add_argument("--use_private_ip", dest="use_private_ip", action='store_true', default=False,
-                        help="if specified, ignore the public ip of the nodes")
-    parser.add_argument("--nodeTypes", dest='nodeTypes', default=None, type=str,
-                        help="Specifies a list of comma-separated node types, each of which is "
-                             "composed of slash-separated instance types, and an optional spot "
-                             "bid set off by a colon, making the node type preemptible. Instance "
-                             "types may appear in multiple node types, and the same node type "
-                             "may appear as both preemptible and non-preemptible.\n"
-                             "Valid argument specifying two node types:\n"
-                             "\tc5.4xlarge/c5a.4xlarge:0.42,t2.large\n"
-                             "Node types:\n"
-                             "\tc5.4xlarge/c5a.4xlarge:0.42 and t2.large\n"
-                             "Instance types:\n"
-                             "\tc5.4xlarge, c5a.4xlarge, and t2.large\n"
-                             "Semantics:\n"
-                             "\tBid $0.42/hour for either c5.4xlarge or c5a.4xlarge instances,\n"
-                             "\ttreated interchangeably, while they are available at that price,\n"
-                             "\tand buy t2.large instances at full price\n"
-                             "Must also provide the --workers argument to specify how many "
-                             "workers of each node type to create.")
-    parser.add_argument("-w", "--workers", dest='workers', default=None, type=str,
-                        help="Comma-separated list of the ranges of numbers of workers of each "
-                             "node type to launch, such as '0-2,5,1-3'. If a range is given, "
-                             "workers will automatically be launched and terminated by the cluster "
-                             "to auto-scale to the workload.")
-    parser.add_argument("--leaderStorage", dest='leaderStorage', type=int, default=50,
-                        help="Specify the size (in gigabytes) of the root volume for the leader "
-                             "instance. This is an EBS volume.")
-    parser.add_argument("--nodeStorage", dest='nodeStorage', type=int, default=50,
-                        help="Specify the size (in gigabytes) of the root volume for any worker "
-                             "instances created when using the -w flag. This is an EBS volume.")
-    parser.add_argument('--forceDockerAppliance', dest='forceDockerAppliance', action='store_true',
-                        default=False,
-                        help="Disables sanity checking the existence of the docker image specified "
-                             "by TOIL_APPLIANCE_SELF, which Toil uses to provision mesos for "
-                             "autoscaling.")
-    parser.add_argument('--awsEc2ProfileArn', dest='awsEc2ProfileArn', default=None, type=str,
-                        help="If provided, the specified ARN is used as the instance profile for EC2 instances."
-                             "Useful for setting custom IAM profiles. If not specified, a new IAM role is created "
-                             "by default with sufficient access to perform basic cluster operations.")
-    parser.add_argument('--awsEc2ExtraSecurityGroupId', dest='awsEc2ExtraSecurityGroupIds', default=[], action='append',
-                        help="Any additional security groups to attach to EC2 instances. Note that a security group "
-                             "with its name equal to the cluster name will always be created, thus ensure that "
-                             "the extra security groups do not have the same name as the cluster name.")
-    #TODO Set Aws Profile in CLI options
+    parser = parser_with_common_options(
+        provisioner_options=True, jobstore_option=False, prog="toil launch-cluster"
+    )
+    parser.add_argument(
+        "-T",
+        "--clusterType",
+        dest="clusterType",
+        choices=["mesos", "kubernetes"],
+        default=None,  # TODO: change default to "kubernetes" when we are ready.
+        help="Cluster scheduler to use.",
+    )
+    parser.add_argument(
+        "--leaderNodeType",
+        dest="leaderNodeType",
+        required=True,
+        help="Non-preemptible node type to use for the cluster leader.",
+    )
+    parser.add_argument(
+        "--keyPairName",
+        dest="keyPairName",
+        help="On AWS, the name of the AWS key pair to include on the instance."
+        " On Google/GCE, this is the ssh key pair.",
+    )
+    parser.add_argument(
+        "--owner",
+        dest="owner",
+        help="The owner tag for all instances. If not given, the value in"
+        "TOIL_OWNER_TAG will be used, or else the value of --keyPairName.",
+    )
+    parser.add_argument(
+        "--boto",
+        dest="botoPath",
+        help="The path to the boto credentials directory. This is transferred "
+        "to all nodes in order to access the AWS jobStore from non-AWS instances.",
+    )
+    parser.add_argument(
+        "-t",
+        "--tag",
+        metavar="NAME=VALUE",
+        dest="tags",
+        default=[],
+        action="append",
+        help="Tags are added to the AWS cluster for this node and all of its "
+        "children. Tags are of the form:\n"
+        " -t key1=value1 --tag key2=value2\n"
+        "Multiple tags are allowed and each tag needs its own flag. By "
+        "default the cluster is tagged with "
+        " {\n"
+        '      "Name": clusterName,\n'
+        '      "Owner": IAM username\n'
+        " }. ",
+    )
+
+    parser.add_argument(
+        "--network", help="GCE cloud network to use. default: 'default'"
+    )
+    parser.add_argument(
+        "--vpcSubnet",
+        help="VPC subnet ID to launch cluster leader in. Uses default subnet "
+        "if not specified. This subnet needs to have auto assign IPs turned on.",
+    )
+    parser.add_argument(
+        "--use_private_ip",
+        dest="use_private_ip",
+        action="store_true",
+        default=False,
+        help="if specified, ignore the public ip of the nodes",
+    )
+    parser.add_argument(
+        "--nodeTypes",
+        dest="nodeTypes",
+        default=None,
+        type=str,
+        help="Specifies a list of comma-separated node types, each of which is "
+        "composed of slash-separated instance types, and an optional spot "
+        "bid set off by a colon, making the node type preemptible. Instance "
+        "types may appear in multiple node types, and the same node type "
+        "may appear as both preemptible and non-preemptible.\n"
+        "Valid argument specifying two node types:\n"
+        "\tc5.4xlarge/c5a.4xlarge:0.42,t2.large\n"
+        "Node types:\n"
+        "\tc5.4xlarge/c5a.4xlarge:0.42 and t2.large\n"
+        "Instance types:\n"
+        "\tc5.4xlarge, c5a.4xlarge, and t2.large\n"
+        "Semantics:\n"
+        "\tBid $0.42/hour for either c5.4xlarge or c5a.4xlarge instances,\n"
+        "\ttreated interchangeably, while they are available at that price,\n"
+        "\tand buy t2.large instances at full price\n"
+        "Must also provide the --workers argument to specify how many "
+        "workers of each node type to create.",
+    )
+    parser.add_argument(
+        "-w",
+        "--workers",
+        dest="workers",
+        default=None,
+        type=str,
+        help="Comma-separated list of the ranges of numbers of workers of each "
+        "node type to launch, such as '0-2,5,1-3'. If a range is given, "
+        "workers will automatically be launched and terminated by the cluster "
+        "to auto-scale to the workload.",
+    )
+    parser.add_argument(
+        "--leaderStorage",
+        dest="leaderStorage",
+        type=int,
+        default=50,
+        help="Specify the size (in gigabytes) of the root volume for the leader "
+        "instance. This is an EBS volume.",
+    )
+    parser.add_argument(
+        "--nodeStorage",
+        dest="nodeStorage",
+        type=int,
+        default=50,
+        help="Specify the size (in gigabytes) of the root volume for any worker "
+        "instances created when using the -w flag. This is an EBS volume.",
+    )
+    parser.add_argument(
+        "--forceDockerAppliance",
+        dest="forceDockerAppliance",
+        action="store_true",
+        default=False,
+        help="Disables sanity checking the existence of the docker image specified "
+        "by TOIL_APPLIANCE_SELF, which Toil uses to provision mesos for "
+        "autoscaling.",
+    )
+    parser.add_argument(
+        "--awsEc2ProfileArn",
+        dest="awsEc2ProfileArn",
+        default=None,
+        type=str,
+        help="If provided, the specified ARN is used as the instance profile for EC2 instances."
+        "Useful for setting custom IAM profiles. If not specified, a new IAM role is created "
+        "by default with sufficient access to perform basic cluster operations.",
+    )
+    parser.add_argument(
+        "--awsEc2ExtraSecurityGroupId",
+        dest="awsEc2ExtraSecurityGroupIds",
+        default=[],
+        action="append",
+        help="Any additional security groups to attach to EC2 instances. Note that a security group "
+        "with its name equal to the cluster name will always be created, thus ensure that "
+        "the extra security groups do not have the same name as the cluster name.",
+    )
+    parser.add_argument(
+        "--allowFuse",
+        type=opt_strtobool,
+        default=True,
+        help="Enable both the leader and worker nodes to be able to run Singularity with FUSE. For "
+        "Kubernetes, this will make the leader privileged and ask workers to run as privileged. "
+        "(default: %(default)s)",
+    )
+    # TODO Set Aws Profile in CLI options
     options = parser.parse_args()
     set_logging_from_options(options)
 
@@ -122,74 +205,94 @@ def main() -> None:
 
     # Get worker node types
     worker_node_types = parse_node_types(options.nodeTypes)
-    check_valid_node_types(options.provisioner, worker_node_types + [({options.leaderNodeType}, None)])
+    check_valid_node_types(
+        options.provisioner, worker_node_types + [({options.leaderNodeType}, None)]
+    )
 
     # Holds string ranges, like "5", or "3-10"
-    worker_node_ranges = options.workers.split(',') if options.workers else []
+    worker_node_ranges = options.workers.split(",") if options.workers else []
 
     # checks the validity of TOIL_APPLIANCE_SELF before proceeding
     applianceSelf(forceDockerAppliance=options.forceDockerAppliance)
 
     # This holds either ints to launch static nodes, or tuples of ints
     # specifying ranges to launch managed auto-scaling nodes, for each type.
-    nodeCounts: List[Union[int, Tuple[int, int]]] = []
+    nodeCounts: list[Union[int, tuple[int, int]]] = []
 
-    if ((worker_node_types != [] or worker_node_ranges != []) and not
-        (worker_node_types != [] and worker_node_ranges != [])):
+    if (worker_node_types != [] or worker_node_ranges != []) and not (
+        worker_node_types != [] and worker_node_ranges != []
+    ):
         raise RuntimeError("The --nodeTypes option requires --workers, and visa versa.")
     if worker_node_types and worker_node_ranges:
-            if not len(worker_node_types) == len(worker_node_ranges):
-                raise RuntimeError("List of worker count ranges must be the same length as the list of node types.")
-
-            for spec in worker_node_ranges:
-                if '-' in spec:
-                    # Provision via autoscaling
-                    parts = spec.split('-')
-                    if len(parts) != 2:
-                        raise RuntimeError("Unacceptable range: " + spec)
-                    nodeCounts.append((int(parts[0]), int(parts[1])))
-                else:
-                    # Provision fixed nodes
-                    nodeCounts.append(int(spec))
-
-    owner = options.owner or os.getenv('TOIL_OWNER_TAG') or options.keyPairName or 'toil'
+        if not len(worker_node_types) == len(worker_node_ranges):
+            raise RuntimeError(
+                "List of worker count ranges must be the same length as the list of node types."
+            )
+
+        for spec in worker_node_ranges:
+            if "-" in spec:
+                # Provision via autoscaling
+                parts = spec.split("-")
+                if len(parts) != 2:
+                    raise RuntimeError("Unacceptable range: " + spec)
+                nodeCounts.append((int(parts[0]), int(parts[1])))
+            else:
+                # Provision fixed nodes
+                nodeCounts.append(int(spec))
+
+    owner = (
+        options.owner or os.getenv("TOIL_OWNER_TAG") or options.keyPairName or "toil"
+    )
 
     # Check to see if the user specified a zone. If not, see if one is stored in an environment variable.
-    options.zone = options.zone or os.environ.get(f'TOIL_{options.provisioner.upper()}_ZONE')
+    options.zone = options.zone or os.environ.get(
+        f"TOIL_{options.provisioner.upper()}_ZONE"
+    )
 
     if not options.zone:
-        raise RuntimeError(f'Please provide a value for --zone or set a default in the '
-                           f'TOIL_{options.provisioner.upper()}_ZONE environment variable.')
+        raise RuntimeError(
+            f"Please provide a value for --zone or set a default in the "
+            f"TOIL_{options.provisioner.upper()}_ZONE environment variable."
+        )
 
     if options.clusterType == "mesos":
-        logger.warning('You are using a Mesos cluster, which is no longer recommended as Toil is '
-                       'transitioning to Kubernetes-based clusters. Consider switching to '
-                       '--clusterType=kubernetes instead.')
+        logger.warning(
+            "You are using a Mesos cluster, which is no longer recommended as Toil is "
+            "transitioning to Kubernetes-based clusters. Consider switching to "
+            "--clusterType=kubernetes instead."
+        )
 
     if options.clusterType is None:
-        logger.warning('Argument --clusterType is not set... using "mesos". '
-                       'In future versions of Toil, the default cluster scheduler will be '
-                       'set to "kubernetes" if the cluster type is not specified.')
+        logger.warning(
+            'Argument --clusterType is not set... using "mesos". '
+            "In future versions of Toil, the default cluster scheduler will be "
+            'set to "kubernetes" if the cluster type is not specified.'
+        )
         options.clusterType = "mesos"
 
-    logger.info('Creating cluster %s...', options.clusterName)
-
-    cluster = cluster_factory(provisioner=options.provisioner,
-                              clusterName=options.clusterName,
-                              clusterType=options.clusterType,
-                              zone=options.zone,
-                              nodeStorage=options.nodeStorage)
-
-    cluster.launchCluster(leaderNodeType=options.leaderNodeType,
-                          leaderStorage=options.leaderStorage,
-                          owner=owner,
-                          keyName=options.keyPairName,
-                          botoPath=options.botoPath,
-                          userTags=tags,
-                          network=options.network,
-                          vpcSubnet=options.vpcSubnet,
-                          awsEc2ProfileArn=options.awsEc2ProfileArn,
-                          awsEc2ExtraSecurityGroupIds=options.awsEc2ExtraSecurityGroupIds)
+    logger.info("Creating cluster %s...", options.clusterName)
+
+    cluster = cluster_factory(
+        provisioner=options.provisioner,
+        clusterName=options.clusterName,
+        clusterType=options.clusterType,
+        zone=options.zone,
+        nodeStorage=options.nodeStorage,
+        enable_fuse=options.allowFuse,
+    )
+
+    cluster.launchCluster(
+        leaderNodeType=options.leaderNodeType,
+        leaderStorage=options.leaderStorage,
+        owner=owner,
+        keyName=options.keyPairName,
+        botoPath=options.botoPath,
+        userTags=tags,
+        network=options.network,
+        vpcSubnet=options.vpcSubnet,
+        awsEc2ProfileArn=options.awsEc2ProfileArn,
+        awsEc2ExtraSecurityGroupIds=options.awsEc2ExtraSecurityGroupIds,
+    )
 
     for typeNum, spec in enumerate(nodeCounts):
         # For each batch of workers to make
@@ -207,8 +310,12 @@ def main() -> None:
                 cluster.addNodes(nodeTypes=wanted[0], numNodes=spec, preemptible=False)
             else:
                 # We have a spot bid
-                cluster.addNodes(nodeTypes=wanted[0], numNodes=spec, preemptible=True,
-                                 spotBid=wanted[1])
+                cluster.addNodes(
+                    nodeTypes=wanted[0],
+                    numNodes=spec,
+                    preemptible=True,
+                    spotBid=wanted[1],
+                )
 
         elif isinstance(spec, tuple):
             # Make a range of auto-scaling nodes
@@ -225,11 +332,20 @@ def main() -> None:
 
             if wanted[1] is None:
                 # Make non-spot instances
-                cluster.addManagedNodes(nodeTypes=wanted[0], minNodes=min_count, maxNodes=max_count,
-                                        preemptible=False)
+                cluster.addManagedNodes(
+                    nodeTypes=wanted[0],
+                    minNodes=min_count,
+                    maxNodes=max_count,
+                    preemptible=False,
+                )
             else:
                 # Bid at the given price.
-                cluster.addManagedNodes(nodeTypes=wanted[0], minNodes=min_count, maxNodes=max_count,
-                                        preemptible=True, spotBid=wanted[1])
-
-    logger.info('Cluster created successfully.')
+                cluster.addManagedNodes(
+                    nodeTypes=wanted[0],
+                    minNodes=min_count,
+                    maxNodes=max_count,
+                    preemptible=True,
+                    spotBid=wanted[1],
+                )
+
+    logger.info("Cluster created successfully.")

toil/utils/toilMain.py

@@ -3,9 +3,8 @@ import re
 import sys
 import textwrap
 import types
-from typing import Any, Dict
-
 from importlib.metadata import version as metadata_version
+from typing import Any
 
 from toil.version import version
 
@@ -13,23 +12,25 @@ from toil.version import version
 def main() -> None:
     modules = loadModules()
 
-    if len(sys.argv) < 2 or sys.argv[1] == '--help':
+    if len(sys.argv) < 2 or sys.argv[1] == "--help":
         printHelp(modules)
         sys.exit(0)
 
     cmd = sys.argv[1]
-    if cmd == '--version':
+    if cmd == "--version":
         printVersion()
         sys.exit(0)
 
     try:
         module = modules[cmd]
     except KeyError:
-        sys.stderr.write(f'Unknown option "{cmd}".  Pass --help to display usage information.\n')
+        sys.stderr.write(
+            f'Unknown option "{cmd}".  Pass --help to display usage information.\n'
+        )
         sys.exit(1)
 
     del sys.argv[1]
-    get_or_die(module, 'main')()
+    get_or_die(module, "main")()
 
 
 def get_or_die(module: types.ModuleType, name: str) -> Any:
@@ -39,12 +40,14 @@ def get_or_die(module: types.ModuleType, name: str) -> Any:
     if hasattr(module, name):
         return getattr(module, name)
     else:
-        sys.stderr.write(f'Internal Toil error!\nToil utility module '
-                         f'{module.__name__} is missing required attribute {name}\n')
+        sys.stderr.write(
+            f"Internal Toil error!\nToil utility module "
+            f"{module.__name__} is missing required attribute {name}\n"
+        )
         sys.exit(1)
 
 
-def loadModules() -> Dict[str, types.ModuleType]:
+def loadModules() -> dict[str, types.ModuleType]:
     # noinspection PyUnresolvedReferences
     from toil.utils import toilClean  # noqa
     from toil.utils import toilConfig  # noqa
@@ -59,13 +62,22 @@ def loadModules() -> Dict[str, types.ModuleType]:
     from toil.utils import toilStats  # noqa
     from toil.utils import toilStatus  # noqa
 
-    return {'-'.join([i.lower() for i in re.findall('[A-Z][^A-Z]*', name)]): module for name, module in locals().items()}
+    return {
+        "-".join([i.lower() for i in re.findall("[A-Z][^A-Z]*", name)]): module
+        for name, module in locals().items()
+    }
 
 
-def printHelp(modules: Dict[str, types.ModuleType]) -> None:
+def printHelp(modules: dict[str, types.ModuleType]) -> None:
     name = os.path.basename(sys.argv[0])
-    descriptions = '\n        '.join(f'{cmd} - {get_or_die(mod, "__doc__").strip()}' for cmd, mod in modules.items() if mod)
-    print(textwrap.dedent(f"""
+    descriptions = "\n        ".join(
+        f'{cmd} - {get_or_die(mod, "__doc__").strip()}'
+        for cmd, mod in modules.items()
+        if mod
+    )
+    print(
+        textwrap.dedent(
+            f"""
         Usage: {name} COMMAND ...
                {name} --help
                {name} COMMAND --help
@@ -73,11 +85,20 @@ def printHelp(modules: Dict[str, types.ModuleType]) -> None:
         Where COMMAND is one of the following:
 
         {descriptions}
-        """[1:]))
+        """[
+                1:
+            ]
+        )
+    )
 
 
 def printVersion() -> None:
     try:
-        print(metadata_version('toil'))
+        detected_version = metadata_version("toil")
+        if "a" in detected_version:
+            # This probably means Toil is installed as development
+            print(version)
+        else:
+            print(detected_version)
     except:
-        print(f'Version gathered from toil.version: {version}')
+        print(f"Version gathered from toil.version: {version}")

toil/utils/toilRsyncCluster.py

@@ -14,27 +14,45 @@
 """Rsyncs into the toil appliance container running on the leader of the cluster."""
 import argparse
 import logging
+import sys
 
 from toil.common import parser_with_common_options
-from toil.provisioners import cluster_factory
+from toil.provisioners import NoSuchClusterException, cluster_factory
 from toil.statsAndLogging import set_logging_from_options
 
 logger = logging.getLogger(__name__)
 
 
 def main() -> None:
-    parser = parser_with_common_options(provisioner_options=True, jobstore_option=False, prog="toil rsync-cluster")
-    parser.add_argument("--insecure", dest='insecure', action='store_true', required=False,
-                        help="Temporarily disable strict host key checking.")
-    parser.add_argument("args", nargs=argparse.REMAINDER, help="Arguments to pass to"
-                        "`rsync`. Takes any arguments that rsync accepts. Specify the"
-                        " remote with a colon. For example, to upload `example.py`,"
-                        " specify `toil rsync-cluster -p aws test-cluster example.py :`."
-                        "\nOr, to download a file from the remote:, `toil rsync-cluster"
-                        " -p aws test-cluster :example.py .`")
+    parser = parser_with_common_options(
+        provisioner_options=True, jobstore_option=False, prog="toil rsync-cluster"
+    )
+    parser.add_argument(
+        "--insecure",
+        dest="insecure",
+        action="store_true",
+        required=False,
+        help="Temporarily disable strict host key checking.",
+    )
+    parser.add_argument(
+        "args",
+        nargs=argparse.REMAINDER,
+        help="Arguments to pass to"
+        "`rsync`. Takes any arguments that rsync accepts. Specify the"
+        " remote with a colon. For example, to upload `example.py`,"
+        " specify `toil rsync-cluster -p aws test-cluster example.py :`."
+        "\nOr, to download a file from the remote:, `toil rsync-cluster"
+        " -p aws test-cluster :example.py .`",
+    )
     options = parser.parse_args()
     set_logging_from_options(options)
-    cluster = cluster_factory(provisioner=options.provisioner,
-                              clusterName=options.clusterName,
-                              zone=options.zone)
-    cluster.getLeader().coreRsync(args=options.args, strict=not options.insecure)
+    cluster = cluster_factory(
+        provisioner=options.provisioner,
+        clusterName=options.clusterName,
+        zone=options.zone,
+    )
+    try:
+        cluster.getLeader().coreRsync(args=options.args, strict=not options.insecure)
+    except NoSuchClusterException as e:
+        logger.error(e)
+        sys.exit(1)