Repository: spark Updated Branches: refs/heads/branch-1.0 afcb9aefc -> b5c62c887
Address SPARK-1717 I tested the change locally with Spark 0.9.1, but I can't test with 1.0.0 because there was no AMI for it at the time. It's a trivial fix, so it shouldn't cause any problems. Author: msiddalingaiah <[email protected]> Closes #641 from msiddalingaiah/master and squashes the following commits: a4f7404 [msiddalingaiah] Address SPARK-1717 (cherry picked from commit bb2bb0cf6efcb1d18846e6c4904f3cd2da452f9f) Signed-off-by: Patrick Wendell <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/b5c62c88 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/b5c62c88 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/b5c62c88 Branch: refs/heads/branch-1.0 Commit: b5c62c887420f76e85bb1a4fe8303bb43af302f3 Parents: afcb9ae Author: msiddalingaiah <[email protected]> Authored: Sun May 4 21:59:10 2014 -0700 Committer: Patrick Wendell <[email protected]> Committed: Sun May 4 21:59:29 2014 -0700 ---------------------------------------------------------------------- ec2/spark_ec2.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/b5c62c88/ec2/spark_ec2.py ---------------------------------------------------------------------- diff --git a/ec2/spark_ec2.py b/ec2/spark_ec2.py index d2def7a..e99fc51 100755 --- a/ec2/spark_ec2.py +++ b/ec2/spark_ec2.py @@ -613,7 +613,7 @@ def ssh_command(opts): return ['ssh'] + ssh_args(opts) -# Run a command on a host through ssh, retrying up to two times +# Run a command on a host through ssh, retrying up to five times # and then throwing an exception if ssh continues to fail. def ssh(host, opts, command): tries = 0 @@ -622,7 +622,7 @@ def ssh(host, opts, command): return subprocess.check_call( ssh_command(opts) + ['-t', '-t', '%s@%s' % (opts.user, host), stringify_command(command)]) except subprocess.CalledProcessError as e: - if (tries > 2): + if (tries > 5): # If this was an ssh failure, provide the user with hints. if e.returncode == 255: raise UsageError("Failed to SSH to remote host {0}.\nPlease check that you have provided the correct --identity-file and --key-pair parameters and try again.".format(host)) @@ -649,7 +649,7 @@ def ssh_write(host, opts, command, input): status = proc.wait() if status == 0: break - elif (tries > 2): + elif (tries > 5): raise RuntimeError("ssh_write failed with error %s" % proc.returncode) else: print >> stderr, "Error {0} while executing remote command, retrying after 30 seconds".format(status)
