diff options
| author | Kay Ousterhout <kayousterhout@gmail.com> | 2013-12-20 14:39:03 -0800 |
|---|---|---|
| committer | Kay Ousterhout <kayousterhout@gmail.com> | 2013-12-20 14:39:30 -0800 |
| commit | c06945cfe0717006ae0d44da797a4fbb1a48954d (patch) | |
| tree | 9eddb7d47b5829bdb2f117b5676ecc18b11328c7 /ec2 | |
| parent | 9228ec847e841a17c7dff7e75bc2e06bea799ea4 (diff) | |
| parent | 0bc57c576792ba800eca0ec196c92a4d29cb3953 (diff) | |
| download | spark-c06945cfe0717006ae0d44da797a4fbb1a48954d.tar.gz spark-c06945cfe0717006ae0d44da797a4fbb1a48954d.tar.bz2 spark-c06945cfe0717006ae0d44da797a4fbb1a48954d.zip | |
Merge remote branch 'upstream/master' into consolidate_schedulers
Conflicts:
core/src/main/scala/org/apache/spark/scheduler/cluster/ClusterTaskSetManager.scala
core/src/main/scala/org/apache/spark/scheduler/cluster/CoarseGrainedSchedulerBackend.scala
core/src/test/scala/org/apache/spark/scheduler/TaskSetManagerSuite.scala
Diffstat (limited to 'ec2')
| -rwxr-xr-x | ec2/spark_ec2.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ec2/spark_ec2.py b/ec2/spark_ec2.py index 1189232428..a2b0e7e7f4 100755 --- a/ec2/spark_ec2.py +++ b/ec2/spark_ec2.py @@ -589,7 +589,7 @@ def ssh(host, opts, command): while True: try: return subprocess.check_call( - ssh_command(opts) + ['-t', '%s@%s' % (opts.user, host), stringify_command(command)]) + ssh_command(opts) + ['-t', '-t', '%s@%s' % (opts.user, host), stringify_command(command)]) except subprocess.CalledProcessError as e: if (tries > 2): # If this was an ssh failure, provide the user with hints. @@ -730,7 +730,7 @@ def real_main(): if opts.proxy_port != None: proxy_opt = ['-D', opts.proxy_port] subprocess.check_call( - ssh_command(opts) + proxy_opt + ['-t', "%s@%s" % (opts.user, master)]) + ssh_command(opts) + proxy_opt + ['-t', '-t', "%s@%s" % (opts.user, master)]) elif action == "get-master": (master_nodes, slave_nodes) = get_existing_cluster(conn, opts, cluster_name) |