You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mahout.apache.org by ap...@apache.org on 2015/07/14 04:04:43 UTC
mahout git commit: (NOJIRA) Bump version to 0.10.2 and check for
spark.executor.memory value before setting to default of 1g in spark-shell.
closes apache/mahout#148
Repository: mahout
Updated Branches:
refs/heads/mahout-0.10.x 094294bcb -> 942c8e1ad
(NOJIRA) Bump version to 0.10.2 and check for spark.executor.memory value before setting to default of 1g in spark-shell. closes apache/mahout#148
Project: http://git-wip-us.apache.org/repos/asf/mahout/repo
Commit: http://git-wip-us.apache.org/repos/asf/mahout/commit/942c8e1a
Tree: http://git-wip-us.apache.org/repos/asf/mahout/tree/942c8e1a
Diff: http://git-wip-us.apache.org/repos/asf/mahout/diff/942c8e1a
Branch: refs/heads/mahout-0.10.x
Commit: 942c8e1adcebb8b2f959c37a7e2039f981c877a8
Parents: 094294b
Author: Andrew Palumbo <ap...@apache.org>
Authored: Mon Jul 13 22:03:55 2015 -0400
Committer: Andrew Palumbo <ap...@apache.org>
Committed: Mon Jul 13 22:03:55 2015 -0400
----------------------------------------------------------------------
.../apache/mahout/sparkbindings/shell/MahoutSparkILoop.scala | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mahout/blob/942c8e1a/spark-shell/src/main/scala/org/apache/mahout/sparkbindings/shell/MahoutSparkILoop.scala
----------------------------------------------------------------------
diff --git a/spark-shell/src/main/scala/org/apache/mahout/sparkbindings/shell/MahoutSparkILoop.scala b/spark-shell/src/main/scala/org/apache/mahout/sparkbindings/shell/MahoutSparkILoop.scala
index 4d0615a..1c27e8b 100644
--- a/spark-shell/src/main/scala/org/apache/mahout/sparkbindings/shell/MahoutSparkILoop.scala
+++ b/spark-shell/src/main/scala/org/apache/mahout/sparkbindings/shell/MahoutSparkILoop.scala
@@ -46,7 +46,10 @@ class MahoutSparkILoop extends SparkILoop {
conf.set("spark.executor.uri", execUri)
}
- conf.set("spark.executor.memory", "1g")
+ // set default value of spark.executor.memory to 1g
+ if(!conf.contains("spark.executor.memory")) {
+ conf.set("spark.executor.memory", "1g")
+ }
sparkContext = mahoutSparkContext(
masterUrl = master,
@@ -89,7 +92,7 @@ class MahoutSparkILoop extends SparkILoop {
_ __ ___ __ _| |__ ___ _ _| |_
| '_ ` _ \ / _` | '_ \ / _ \| | | | __|
| | | | | | (_| | | | | (_) | |_| | |_
- |_| |_| |_|\__,_|_| |_|\___/ \__,_|\__| version 0.10.0
+ |_| |_| |_|\__,_|_| |_|\___/ \__,_|\__| version 0.10.2
""")
import Properties._