You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by jo...@apache.org on 2017/09/22 01:22:42 UTC
zeppelin git commit: [ZEPPELIN-2930] Releasing session of JDBC
interpreter close().
Repository: zeppelin
Updated Branches:
refs/heads/master 7f16fc217 -> 84e9bd96d
[ZEPPELIN-2930] Releasing session of JDBC interpreter close().
### What is this PR for?
This PR fixes that the session release issue of close() of JDBC interpreter.
### What type of PR is it?
Bug Fix
### What is the Jira issue?
https://issues.apache.org/jira/browse/ZEPPELIN-2930
### Questions:
* Does the licenses files need update? no
* Is there breaking changes for older versions? no
* Does this needs documentation? no
Author: Shim <yo...@gmail.com>
Closes #2586 from astroshim/ZEPPELIN-2930 and squashes the following commits:
08224c37 [Shim] fixed release session.
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/84e9bd96
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/84e9bd96
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/84e9bd96
Branch: refs/heads/master
Commit: 84e9bd96d26c10edf48194980f5e0fbf5605f0ef
Parents: 7f16fc2
Author: Shim <yo...@gmail.com>
Authored: Wed Sep 13 22:07:28 2017 +0900
Committer: Jongyoul Lee <jo...@apache.org>
Committed: Fri Sep 22 10:22:42 2017 +0900
----------------------------------------------------------------------
.../java/org/apache/zeppelin/jdbc/JDBCInterpreter.java | 12 +++++++++---
.../apache/zeppelin/jdbc/JDBCUserConfigurations.java | 6 ------
2 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/84e9bd96/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java
----------------------------------------------------------------------
diff --git a/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java b/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java
index 4bb4f0f..be24aea 100644
--- a/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java
+++ b/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java
@@ -278,11 +278,17 @@ public class JDBCInterpreter extends KerberosInterpreter {
}
private void initConnectionPoolMap() {
- for (JDBCUserConfigurations configurations : jdbcUserConfigurationsMap.values()) {
+ for (String key : jdbcUserConfigurationsMap.keySet()) {
+ try {
+ closeDBPool(key, DEFAULT_KEY);
+ } catch (SQLException e) {
+ logger.error("Error while closing database pool.", e);
+ }
try {
+ JDBCUserConfigurations configurations = jdbcUserConfigurationsMap.get(key);
configurations.initConnectionPoolMap();
- } catch (Exception e) {
- logger.error("Error while closing initConnectionPoolMap...", e);
+ } catch (SQLException e) {
+ logger.error("Error while closing initConnectionPoolMap.", e);
}
}
}
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/84e9bd96/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCUserConfigurations.java
----------------------------------------------------------------------
diff --git a/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCUserConfigurations.java b/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCUserConfigurations.java
index d00e1e9..0579380 100644
--- a/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCUserConfigurations.java
+++ b/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCUserConfigurations.java
@@ -48,12 +48,6 @@ public class JDBCUserConfigurations {
}
public void initConnectionPoolMap() throws SQLException {
- Iterator<String> it = poolingDriverMap.keySet().iterator();
- while (it.hasNext()) {
- String driverName = it.next();
- poolingDriverMap.get(driverName).closePool(driverName);
- it.remove();
- }
poolingDriverMap.clear();
isSuccessful.clear();
}