Repository: zeppelin
Updated Branches:
  refs/heads/master 71bc75966 -> 957afddc8


ZEPPELIN-3767. zeppelin.spark.concurrentSQL setting is not working

### What is this PR for?

Trivial PR to fix the this issue.

### What type of PR is it?
[Bug Fix]

### Todos
* [ ] - Task

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

### How should this be tested?
* CI pass

### Screenshots (if appropriate)

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

Author: Jeff Zhang <zjf...@apache.org>

Closes #3171 from zjffdu/ZEPPELIN-3767 and squashes the following commits:

da99c3f1b [Jeff Zhang] ZEPPELIN-3767. zeppelin.spark.concurrentSQL setting is 
not working


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

Branch: refs/heads/master
Commit: 957afddc8e814abfe3b5d78b0455f888c770b033
Parents: 71bc759
Author: Jeff Zhang <zjf...@apache.org>
Authored: Fri Sep 7 15:13:11 2018 +0800
Committer: Jeff Zhang <zjf...@apache.org>
Committed: Mon Sep 10 15:33:58 2018 +0800

----------------------------------------------------------------------
 .../main/java/org/apache/zeppelin/spark/SparkSqlInterpreter.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zeppelin/blob/957afddc/spark/interpreter/src/main/java/org/apache/zeppelin/spark/SparkSqlInterpreter.java
----------------------------------------------------------------------
diff --git 
a/spark/interpreter/src/main/java/org/apache/zeppelin/spark/SparkSqlInterpreter.java
 
b/spark/interpreter/src/main/java/org/apache/zeppelin/spark/SparkSqlInterpreter.java
index 04eb844..e717b2a 100644
--- 
a/spark/interpreter/src/main/java/org/apache/zeppelin/spark/SparkSqlInterpreter.java
+++ 
b/spark/interpreter/src/main/java/org/apache/zeppelin/spark/SparkSqlInterpreter.java
@@ -111,7 +111,7 @@ public class SparkSqlInterpreter extends Interpreter {
   @Override
   public Scheduler getScheduler() {
     if (concurrentSQL()) {
-      int maxConcurrency = 
Integer.parseInt(getProperty("zeppelin.spark.concurrentSQL", "10"));
+      int maxConcurrency = 
Integer.parseInt(getProperty("zeppelin.spark.concurrentSQL.max", "10"));
       return SchedulerFactory.singleton().createOrGetParallelScheduler(
           SparkSqlInterpreter.class.getName() + this.hashCode(), 
maxConcurrency);
     } else {

Reply via email to