Repository: oozie Updated Branches: refs/heads/master fd7708949 -> e882a05a5
OOZIE-2541 Possible resource leak in Hive2Credentials (pbacsko via rkanter) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/e882a05a Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/e882a05a Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/e882a05a Branch: refs/heads/master Commit: e882a05a5ff21d8e76e9bc2ca3c09b447efb461d Parents: fd77089 Author: Robert Kanter <[email protected]> Authored: Wed Jun 8 19:01:36 2016 -0700 Committer: Robert Kanter <[email protected]> Committed: Wed Jun 8 19:01:36 2016 -0700 ---------------------------------------------------------------------- .../oozie/action/hadoop/Hive2Credentials.java | 17 ++++++++++++----- release-log.txt | 1 + 2 files changed, 13 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/e882a05a/core/src/main/java/org/apache/oozie/action/hadoop/Hive2Credentials.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/action/hadoop/Hive2Credentials.java b/core/src/main/java/org/apache/oozie/action/hadoop/Hive2Credentials.java index e4ebe97..bd2f1f7 100644 --- a/core/src/main/java/org/apache/oozie/action/hadoop/Hive2Credentials.java +++ b/core/src/main/java/org/apache/oozie/action/hadoop/Hive2Credentials.java @@ -60,12 +60,19 @@ public class Hive2Credentials extends Credentials { HIVE2_SERVER_PRINCIPAL + " is required to get hive server 2 credential"); } url = url + ";principal=" + principal; - Connection con = DriverManager.getConnection(url); - XLog.getLog(getClass()).debug("Connected successfully to " + url); - // get delegation token for the given proxy user - String tokenStr = ((HiveConnection)con).getDelegationToken(jobconf.get(USER_NAME), principal); + Connection con = null; + String tokenStr = null; + try { + con = DriverManager.getConnection(url); + XLog.getLog(getClass()).debug("Connected successfully to " + url); + // get delegation token for the given proxy user + tokenStr = ((HiveConnection)con).getDelegationToken(jobconf.get(USER_NAME), principal); + } finally { + if (con != null) { + con.close(); + } + } XLog.getLog(getClass()).debug("Got token"); - con.close(); Token<DelegationTokenIdentifier> hive2Token = new Token<DelegationTokenIdentifier>(); hive2Token.decodeFromUrlString(tokenStr); http://git-wip-us.apache.org/repos/asf/oozie/blob/e882a05a/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 5fd8ef8..039a033 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.3.0 release (trunk - unreleased) +OOZIE-2541 Possible resource leak in Hive2Credentials (pbacsko via rkanter) OOZIE-2563 Pass spark-defaults.conf to spark action (satishsaley via rohini) OOZIE-2556 TestAbandonedCoordChecker.testCatchupJob is flaky (puru) OOZIE-2522 There can be multiple coord submit from bundle in case of ZK glitch (puru)
