diff --git a/forward-local-ports b/forward-local-ports index dbe95dd..d9e88ab 100755 --- a/forward-local-ports +++ b/forward-local-ports @@ -20,6 +20,8 @@ # and http://docs.aws.amazon.com/ElasticMapReduce/latest/DeveloperGuide/emr-connect-master-no$ printUsage() { + echo "Forwards local ports to a cluster master over an SSH tunnel." + echo "" echo "Usage: $0 [*]" echo "" echo "Please provide first the cluster-id printed by the 'launch-cluster' command." diff --git a/launch-cluster b/launch-cluster index 9372111..eadf4ae 100755 --- a/launch-cluster +++ b/launch-cluster @@ -15,12 +15,17 @@ # limitations under the License. -# Establishes an SSH session with local port forwarding per http://docs.aws.amazon.com/ElasticMapReduce/latest/DeveloperGuide$ -# For alternative access methods, see http://docs.aws.amazon.com/ElasticMapReduce/latest/DeveloperGuide/emr-connect-master-no$ +# Establishes an SSH session with local port forwarding per +# http://docs.aws.amazon.com/ElasticMapReduce/latest/DeveloperGuide/emr-ssh-tunnel-local.html +# +# For alternative methods of connecting, see +# http://docs.aws.amazon.com/ElasticMapReduce/latest/DeveloperGuide/emr-connect-master-node.html LAUNCHER_HOME=${PWD} CONFIGFILE=$1 if [ -z "${CONFIGFILE}" ]; then + echo "Lauches a cluster and prints the cluster-id on stdout." + echo "" echo "Usage: $0 " exit 1 fi diff --git a/ssh-to-master b/ssh-to-master index fb93745..d12b9ca 100755 --- a/ssh-to-master +++ b/ssh-to-master @@ -15,9 +15,9 @@ # limitations under the License. -# Assists with establishing an SSH session to an EMR cluster master. - printUsage() { + echo "Assists with establishing an SSH session to an EMR cluster master." + echo "" echo "Usage: $0 [*]" echo "" echo "Please provide first the cluster-id printed by the 'launch-cluster' command." diff --git a/upload-resources b/upload-resources index bfba875..6ce2090 100755 --- a/upload-resources +++ b/upload-resources @@ -18,6 +18,8 @@ LAUNCHER_HOME=${PWD} CONFIGFILE=$1 if [ -z "${CONFIGFILE}" ]; then + echo "Uploads resources required for cluster launch into an S3 bucket." + echo "" echo "Usage: $0 " exit 1 fi diff --git a/wait-until-ready b/wait-until-ready index 8d48a01..9be30dd 100755 --- a/wait-until-ready +++ b/wait-until-ready @@ -18,6 +18,8 @@ # Waits for a cluster to be ready for use. printUsage() { + echo "Waits for a cluster to be ready to use." + echo "" echo "Usage: $0 " echo "" echo "Please provide the cluster-id printed by the 'launch-cluster' command." @@ -31,5 +33,5 @@ if [ -z "${CLUSTER_ID}" ]; then exit 1 fi -echo "Waiting... This can take 10 minutes or more." +echo "Waiting... This can take 10 minutes or more if the cluster was launched recently." time aws --profile ${AWS_PROFILE:-"default"} emr wait cluster-running --cluster-id ${CLUSTER_ID}