You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by mo...@apache.org on 2016/08/07 15:43:24 UTC

zeppelin git commit: [ZEPPELIN-1289] Update the default value of 'spark.executor.memory' property

Repository: zeppelin
Updated Branches:
  refs/heads/master 55695c9c3 -> 8a179f4b6


[ZEPPELIN-1289] Update the default value of 'spark.executor.memory' property

### What is this PR for?
As of Spark 1.5.0, the default value of 'spark.executor.memory' is 1g, not 512m so let's follow the change.

### What type of PR is it?
Improvement

### Todos
* [x] - Replaced all of the occurrences of the default value of spark.executor.memory with '1g'

### What is the Jira issue?
https://issues.apache.org/jira/browse/ZEPPELIN-1289

### How should this be tested?
Should be checked by some people's eyes.

### Questions:
* Does the licenses files need update?: no
* Is there breaking changes for older versions?: no
* Does this needs documentation?: no

Author: Kousuke Saruta <sa...@oss.nttdata.co.jp>

Closes #1280 from sarutak/ZEPPELIN-1289 and squashes the following commits:

bd58d8f [Kousuke Saruta] Modified the default value of "spark.executor.memory"


Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/8a179f4b
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/8a179f4b
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/8a179f4b

Branch: refs/heads/master
Commit: 8a179f4b66ddb29708bf7de27be9042f7ac5c963
Parents: 55695c9
Author: Kousuke Saruta <sa...@oss.nttdata.co.jp>
Authored: Thu Aug 4 16:06:49 2016 +0900
Committer: Lee moon soo <mo...@apache.org>
Committed: Sun Aug 7 08:43:08 2016 -0700

----------------------------------------------------------------------
 docs/interpreter/spark.md         | 2 +-
 docs/rest-api/rest-interpreter.md | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zeppelin/blob/8a179f4b/docs/interpreter/spark.md
----------------------------------------------------------------------
diff --git a/docs/interpreter/spark.md b/docs/interpreter/spark.md
index 81f4844..b094ccd 100644
--- a/docs/interpreter/spark.md
+++ b/docs/interpreter/spark.md
@@ -79,7 +79,7 @@ You can also set other Spark properties which are not listed in the table. For a
   </tr>
   <tr>
     <td>spark.executor.memory </td>
-    <td>512m</td>
+    <td>1g</td>
     <td>Executor memory per worker instance. <br/> ex) 512m, 32g</td>
   </tr>
   <tr>

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/8a179f4b/docs/rest-api/rest-interpreter.md
----------------------------------------------------------------------
diff --git a/docs/rest-api/rest-interpreter.md b/docs/rest-api/rest-interpreter.md
index 4d7c49d..161c38b 100644
--- a/docs/rest-api/rest-interpreter.md
+++ b/docs/rest-api/rest-interpreter.md
@@ -75,7 +75,7 @@ The role of registered interpreters, settings and interpreters group are describ
       "className": "org.apache.zeppelin.spark.SparkInterpreter",
       "properties": {
         "spark.executor.memory": {
-          "defaultValue": "512m",
+          "defaultValue": "1g",
           "description": "Executor memory per worker instance. ex) 512m, 32g"
         },
         "spark.cores.max": {
@@ -154,7 +154,7 @@ The role of registered interpreters, settings and interpreters group are describ
       "group": "spark",
       "properties": {
         "spark.cores.max": "",
-        "spark.executor.memory": "512m",
+        "spark.executor.memory": "1g",
       },
       "interpreterGroup": [
         {