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/06/27 00:21:34 UTC
git commit: Fixing AWS instance type information based upon current
EC2 data
Repository: spark
Updated Branches:
refs/heads/master 6587ef7c1 -> 62d4a0fa9
Fixing AWS instance type information based upon current EC2 data
Fixed a problem in previous file in which some information regarding AWS instance types were wrong. Such information was updated base upon current AWS EC2 data.
Author: Zichuan Ye <je...@tangentds.com>
Closes #1156 from jerry86/master and squashes the following commits:
ff36e95 [Zichuan Ye] Fixing AWS instance type information based upon current EC2 data
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/62d4a0fa
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/62d4a0fa
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/62d4a0fa
Branch: refs/heads/master
Commit: 62d4a0fa9947e64c1533f66ae577557bcfb271c9
Parents: 6587ef7
Author: Zichuan Ye <je...@tangentds.com>
Authored: Thu Jun 26 15:21:29 2014 -0700
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Thu Jun 26 15:21:29 2014 -0700
----------------------------------------------------------------------
ec2/spark_ec2.py | 25 +++++++++++++++++--------
1 file changed, 17 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/62d4a0fa/ec2/spark_ec2.py
----------------------------------------------------------------------
diff --git a/ec2/spark_ec2.py b/ec2/spark_ec2.py
index e80f928..e22d93b 100755
--- a/ec2/spark_ec2.py
+++ b/ec2/spark_ec2.py
@@ -203,6 +203,8 @@ def get_spark_shark_version(opts):
# Attempt to resolve an appropriate AMI given the architecture and
# region of the request.
+# Information regarding Amazon Linux AMI instance type was update on 2014-6-20:
+# http://aws.amazon.com/amazon-linux-ami/instance-type-matrix/
def get_spark_ami(opts):
instance_types = {
"m1.small": "pvm",
@@ -218,10 +220,12 @@ def get_spark_ami(opts):
"cc1.4xlarge": "hvm",
"cc2.8xlarge": "hvm",
"cg1.4xlarge": "hvm",
- "hs1.8xlarge": "hvm",
- "hi1.4xlarge": "hvm",
- "m3.xlarge": "hvm",
- "m3.2xlarge": "hvm",
+ "hs1.8xlarge": "pvm",
+ "hi1.4xlarge": "pvm",
+ "m3.medium": "pvm",
+ "m3.large": "pvm",
+ "m3.xlarge": "pvm",
+ "m3.2xlarge": "pvm",
"cr1.8xlarge": "hvm",
"i2.xlarge": "hvm",
"i2.2xlarge": "hvm",
@@ -526,7 +530,8 @@ def wait_for_cluster(conn, wait_secs, master_nodes, slave_nodes):
# Get number of local disks available for a given EC2 instance type.
def get_num_disks(instance_type):
- # From http://docs.amazonwebservices.com/AWSEC2/latest/UserGuide/index.html?InstanceStorage.html
+ # From http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/InstanceStorage.html
+ # Updated 2014-6-20
disks_by_instance = {
"m1.small": 1,
"m1.medium": 1,
@@ -544,8 +549,10 @@ def get_num_disks(instance_type):
"hs1.8xlarge": 24,
"cr1.8xlarge": 2,
"hi1.4xlarge": 2,
- "m3.xlarge": 0,
- "m3.2xlarge": 0,
+ "m3.medium": 1,
+ "m3.large": 1,
+ "m3.xlarge": 2,
+ "m3.2xlarge": 2,
"i2.xlarge": 1,
"i2.2xlarge": 2,
"i2.4xlarge": 4,
@@ -559,7 +566,9 @@ def get_num_disks(instance_type):
"r3.xlarge": 1,
"r3.2xlarge": 1,
"r3.4xlarge": 1,
- "r3.8xlarge": 2
+ "r3.8xlarge": 2,
+ "g2.2xlarge": 1,
+ "t1.micro": 0
}
if instance_type in disks_by_instance:
return disks_by_instance[instance_type]