You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by pw...@apache.org on 2014/01/11 02:14:29 UTC
[1/2] git commit: Add i2 instance types to Spark EC2.
Updated Branches:
refs/heads/master f26553102 -> 88faa30a4
Add i2 instance types to Spark EC2.
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/7c4e6e1b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/7c4e6e1b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/7c4e6e1b
Branch: refs/heads/master
Commit: 7c4e6e1bf1dbe38270f5f4d1f3ca08c0be242553
Parents: 0ebc973
Author: Shivaram Venkataraman <sh...@eecs.berkeley.edu>
Authored: Fri Jan 10 12:44:55 2014 -0800
Committer: Shivaram Venkataraman <sh...@eecs.berkeley.edu>
Committed: Fri Jan 10 12:44:55 2014 -0800
----------------------------------------------------------------------
ec2/spark_ec2.py | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/7c4e6e1b/ec2/spark_ec2.py
----------------------------------------------------------------------
diff --git a/ec2/spark_ec2.py b/ec2/spark_ec2.py
index d82a1e1..e7cb5ab 100755
--- a/ec2/spark_ec2.py
+++ b/ec2/spark_ec2.py
@@ -185,7 +185,11 @@ def get_spark_ami(opts):
"hi1.4xlarge": "hvm",
"m3.xlarge": "hvm",
"m3.2xlarge": "hvm",
- "cr1.8xlarge": "hvm"
+ "cr1.8xlarge": "hvm",
+ "i2.xlarge": "hvm",
+ "i2.2xlarge": "hvm",
+ "i2.4xlarge": "hvm",
+ "i2.8xlarge": "hvm"
}
if opts.instance_type in instance_types:
instance_type = instance_types[opts.instance_type]
@@ -478,7 +482,11 @@ def get_num_disks(instance_type):
"cr1.8xlarge": 2,
"hi1.4xlarge": 2,
"m3.xlarge": 0,
- "m3.2xlarge": 0
+ "m3.2xlarge": 0,
+ "i2.xlarge": 1,
+ "i2.2xlarge": 2,
+ "i2.4xlarge": 4,
+ "i2.8xlarge": 8
}
if instance_type in disks_by_instance:
return disks_by_instance[instance_type]
[2/2] git commit: Merge pull request #385 from
shivaram/add-i2-instances
Posted by pw...@apache.org.
Merge pull request #385 from shivaram/add-i2-instances
Add i2 instance types to Spark EC2.
Using data from http://aws.amazon.com/amazon-linux-ami/instance-type-matrix/ and http://www.ec2instances.info/
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/88faa30a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/88faa30a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/88faa30a
Branch: refs/heads/master
Commit: 88faa30a4225948d4359cf2775aa15d9146bcbfa
Parents: f265531 7c4e6e1
Author: Patrick Wendell <pw...@gmail.com>
Authored: Fri Jan 10 17:14:22 2014 -0800
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Fri Jan 10 17:14:22 2014 -0800
----------------------------------------------------------------------
ec2/spark_ec2.py | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------