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/16 21:13:08 UTC
zeppelin git commit: [ZEPPELIN-1302] fix rinterpreter default prop
values init error
Repository: zeppelin
Updated Branches:
refs/heads/master 37696ea8b -> c9d2a2c6c
[ZEPPELIN-1302] fix rinterpreter default prop values init error
### What is this PR for?
1.
Correct the calling to `SparkInterpreter.getSystemDefault`
from
`SparkInterpreter.getSystemDefault(propName, envName, defaultValue) `
to
`SparkInterpreter.getSystemDefault(envName, propName, defaultValue) `
2.
correct the `propName` parameter for `rhadoop.sparkstreamingjar` here.
### What type of PR is it?
Bug Fix
### Todos
N/A
### What is the Jira issue?
https://issues.apache.org/jira/browse/ZEPPELIN-1302
### How should this be tested?
Existing tests.
### Screenshots (if appropriate)
N/A
### Questions:
* Does the licenses files need update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? No
Author: WeichenXu <We...@outlook.com>
Closes #1296 from WeichenXu123/fix_rinterpreter_props and squashes the following commits:
cb7ce64 [WeichenXu] fix rinterpreter default prop values init error
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/c9d2a2c6
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/c9d2a2c6
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/c9d2a2c6
Branch: refs/heads/master
Commit: c9d2a2c6ceb332118ab116a98616333ce121c265
Parents: 37696ea
Author: WeichenXu <We...@outlook.com>
Authored: Fri Aug 5 21:08:39 2016 -0700
Committer: Lee moon soo <mo...@apache.org>
Committed: Tue Aug 16 14:13:03 2016 -0700
----------------------------------------------------------------------
.../org/apache/zeppelin/rinterpreter/RInterpreter.scala | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/c9d2a2c6/r/src/main/scala/org/apache/zeppelin/rinterpreter/RInterpreter.scala
----------------------------------------------------------------------
diff --git a/r/src/main/scala/org/apache/zeppelin/rinterpreter/RInterpreter.scala b/r/src/main/scala/org/apache/zeppelin/rinterpreter/RInterpreter.scala
index 959f649..a8e695e 100644
--- a/r/src/main/scala/org/apache/zeppelin/rinterpreter/RInterpreter.scala
+++ b/r/src/main/scala/org/apache/zeppelin/rinterpreter/RInterpreter.scala
@@ -110,10 +110,10 @@ object RInterpreter {
// These are the additional properties we need on top of the ones provided by the spark interpreters
lazy val props: Map[String, InterpreterProperty] = new InterpreterPropertyBuilder()
- .add("rhadoop.cmd", SparkInterpreter.getSystemDefault("rhadoop.cmd", "HADOOP_CMD", ""), "Usually /usr/bin/hadoop")
- .add("rhadooop.streamingjar", SparkInterpreter.getSystemDefault("rhadoop.cmd", "HADOOP_STREAMING", ""), "Usually /usr/lib/hadoop/contrib/streaming/hadoop-streaming-<version>.jar")
- .add("rscala.debug", SparkInterpreter.getSystemDefault("rscala.debug","RSCALA_DEBUG", "false"), "Whether to turn on rScala debugging") // TEST: Implemented but not tested
- .add("rscala.timeout", SparkInterpreter.getSystemDefault("rscala.timeout","RSCALA_TIMEOUT", "60"), "Timeout for rScala") // TEST: Implemented but not tested
+ .add("rhadoop.cmd", SparkInterpreter.getSystemDefault("HADOOP_CMD", "rhadoop.cmd", ""), "Usually /usr/bin/hadoop")
+ .add("rhadooop.streamingjar", SparkInterpreter.getSystemDefault("HADOOP_STREAMING", "rhadooop.streamingjar", ""), "Usually /usr/lib/hadoop/contrib/streaming/hadoop-streaming-<version>.jar")
+ .add("rscala.debug", SparkInterpreter.getSystemDefault("RSCALA_DEBUG", "rscala.debug","false"), "Whether to turn on rScala debugging") // TEST: Implemented but not tested
+ .add("rscala.timeout", SparkInterpreter.getSystemDefault("RSCALA_TIMEOUT", "rscala.timeout","60"), "Timeout for rScala") // TEST: Implemented but not tested
.build
def getProps() = {