Merge pull request #1222 from GoogleCloudPlatform/fix_aws_spark_service

Fix aws spark service
GoogleCloudPlatform · Nov 29, 2016 · 5e7f992 · 5e7f992
2 parents 9e4423c + 9c2260a
commit 5e7f992
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,6 @@
 *.swp
 /perfkitbenchmarker.egg-info
 /.tox
+*.iml
+/.idea
+/*git_ignore*
diff --git a/perfkitbenchmarker/linux_benchmarks/spark_benchmark.py b/perfkitbenchmarker/linux_benchmarks/spark_benchmark.py
@@ -71,6 +71,7 @@
           boot_disk_size: 500
         AWS:
           machine_type: m4.xlarge
+          zone: us-east-1a
       vm_count: 2
 """
 

diff --git a/perfkitbenchmarker/providers/aws/aws_emr.py b/perfkitbenchmarker/providers/aws/aws_emr.py
@@ -95,7 +95,7 @@ class AwsEMR(spark_service.BaseSparkService):
   """
 
   CLOUD = providers.AWS
-  SPARK_SAMPLE_LOCATION = '/usr/lib/spark/examples/jars/spark-examples.jar'
+  SPARK_SAMPLE_LOCATION = '/usr/lib/spark/lib/spark-examples.jar'
   SERVICE_NAME = 'emr'
 
   def __init__(self, spark_service_spec):
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,3 +7,6 @@ @@
     *.swp
     /perfkitbenchmarker.egg-info
     /.tox
+    *.iml
+    /.idea
+    /*git_ignore*