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/02/13 21:44:30 UTC
git commit: Add c3 instance types to Spark EC2
Updated Branches:
refs/heads/branch-0.9 e5b86b1b7 -> 19b4bb2b4
Add c3 instance types to Spark EC2
The number of disks for the c3 instance types taken from here: http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/InstanceStorage.html#StorageOnInstanceTypes
Author: Christian Lundgren <ch...@gameanalytics.com>
Closes #595 from chrisavl/branch-0.9 and squashes the following commits:
c8af5f9 [Christian Lundgren] Add c3 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/19b4bb2b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/19b4bb2b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/19b4bb2b
Branch: refs/heads/branch-0.9
Commit: 19b4bb2b444f1dbc4592bf3d58b17652e0ae6d6b
Parents: e5b86b1
Author: Christian Lundgren <ch...@gameanalytics.com>
Authored: Thu Feb 13 12:44:21 2014 -0800
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Thu Feb 13 12:44:21 2014 -0800
----------------------------------------------------------------------
ec2/spark_ec2.py | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/19b4bb2b/ec2/spark_ec2.py
----------------------------------------------------------------------
diff --git a/ec2/spark_ec2.py b/ec2/spark_ec2.py
index e46e1f5..e88f80a 100755
--- a/ec2/spark_ec2.py
+++ b/ec2/spark_ec2.py
@@ -189,7 +189,12 @@ def get_spark_ami(opts):
"i2.xlarge": "hvm",
"i2.2xlarge": "hvm",
"i2.4xlarge": "hvm",
- "i2.8xlarge": "hvm"
+ "i2.8xlarge": "hvm",
+ "c3.large": "pvm",
+ "c3.xlarge": "pvm",
+ "c3.2xlarge": "pvm",
+ "c3.4xlarge": "pvm",
+ "c3.8xlarge": "pvm"
}
if opts.instance_type in instance_types:
instance_type = instance_types[opts.instance_type]
@@ -486,7 +491,12 @@ def get_num_disks(instance_type):
"i2.xlarge": 1,
"i2.2xlarge": 2,
"i2.4xlarge": 4,
- "i2.8xlarge": 8
+ "i2.8xlarge": 8,
+ "c3.large": 2,
+ "c3.xlarge": 2,
+ "c3.2xlarge": 2,
+ "c3.4xlarge": 2,
+ "c3.8xlarge": 2
}
if instance_type in disks_by_instance:
return disks_by_instance[instance_type]