This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

rename default_spark_mem template variable to spark_worker_mem

  • Loading branch information...
armisael committed Jul 2, 2015
1 parent 7877268 commit 19ae4a54b48b20233628f8d25a7269d785985e17
Showing with 3 additions and 3 deletions.
  1. +1 −1 README.md
  2. +1 −1 deploy_templates.py
  3. +1 −1 templates/root/spark/conf/spark-defaults.conf
View
@@ -33,7 +33,7 @@ and can be used to install any pre-requisites.
{{hdfs_data_dirs}}
{{mapred_local_dirs}}
{{spark_local_dirs}}
{{default_spark_mem}}
{{spark_worker_mem}}
{{spark_worker_instances}}
{{spark_worker_cores}}
{{spark_master_opts}}
View
@@ -66,7 +66,7 @@
"hdfs_data_dirs": os.getenv("HDFS_DATA_DIRS"),
"mapred_local_dirs": os.getenv("MAPRED_LOCAL_DIRS"),
"spark_local_dirs": os.getenv("SPARK_LOCAL_DIRS"),
"default_spark_mem": "%dm" % slave_ram_mb,
"spark_worker_mem": "%dm" % slave_ram_mb,
"spark_worker_instances": worker_instances_str,
"spark_worker_cores": "%d" % worker_cores,
"spark_master_opts": os.getenv("SPARK_MASTER_OPTS", ""),
@@ -1,4 +1,4 @@
spark.executor.memory {{default_spark_mem}}
spark.executor.memory {{spark_worker_mem}}
spark.executor.extraLibraryPath /root/ephemeral-hdfs/lib/native/
spark.executor.extraClassPath /root/ephemeral-hdfs/conf

0 comments on commit 19ae4a5

Please sign in to comment.