Repository: sqoop Updated Branches: refs/heads/SQOOP-1367 2194abb24 -> 794099da4
SQOOP-1476: Generic JDBC Connector - DB connections not closed (Claire Fautsch via Jarek Jarcec Cecho) Project: http://git-wip-us.apache.org/repos/asf/sqoop/repo Commit: http://git-wip-us.apache.org/repos/asf/sqoop/commit/794099da Tree: http://git-wip-us.apache.org/repos/asf/sqoop/tree/794099da Diff: http://git-wip-us.apache.org/repos/asf/sqoop/diff/794099da Branch: refs/heads/SQOOP-1367 Commit: 794099da4b4c5e8f7c1b47fc867740a8b4cb079c Parents: 2194abb Author: Jarek Jarcec Cecho <[email protected]> Authored: Mon Sep 1 15:27:18 2014 +0200 Committer: Jarek Jarcec Cecho <[email protected]> Committed: Mon Sep 1 15:27:18 2014 +0200 ---------------------------------------------------------------------- .../jdbc/GenericJdbcFromInitializer.java | 3 +++ .../connector/jdbc/GenericJdbcToDestroyer.java | 19 +++++++++++-------- 2 files changed, 14 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/sqoop/blob/794099da/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/GenericJdbcFromInitializer.java ---------------------------------------------------------------------- diff --git a/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/GenericJdbcFromInitializer.java b/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/GenericJdbcFromInitializer.java index fbbe506..87e0862 100644 --- a/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/GenericJdbcFromInitializer.java +++ b/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/GenericJdbcFromInitializer.java @@ -111,6 +111,9 @@ public class GenericJdbcFromInitializer extends Initializer<ConnectionConfigurat LOG.info("Ignoring exception while closing ResultSet", e); } } + if (executor != null) { + executor.close(); + } } } http://git-wip-us.apache.org/repos/asf/sqoop/blob/794099da/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/GenericJdbcToDestroyer.java ---------------------------------------------------------------------- diff --git a/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/GenericJdbcToDestroyer.java b/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/GenericJdbcToDestroyer.java index 3ec7b2f..4ba278e 100644 --- a/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/GenericJdbcToDestroyer.java +++ b/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/GenericJdbcToDestroyer.java @@ -48,14 +48,17 @@ public class GenericJdbcToDestroyer extends Destroyer<ConnectionConfiguration, T connectorConf.connection.connectionString, connectorConf.connection.username, connectorConf.connection.password); - - if(success) { - LOG.info("Job completed, transferring data from stage fromTable to " + - "destination fromTable."); - executor.migrateData(stageTableName, tableName); - } else { - LOG.warn("Job failed, clearing stage fromTable."); - executor.deleteTableData(stageTableName); + try { + if(success) { + LOG.info("Job completed, transferring data from stage fromTable to " + + "destination fromTable."); + executor.migrateData(stageTableName, tableName); + } else { + LOG.warn("Job failed, clearing stage fromTable."); + executor.deleteTableData(stageTableName); + } + } finally { + executor.close(); } }
