From 586e15f693a5da97a3f894f4bab613d3becb8e72 Mon Sep 17 00:00:00 2001 From: Ricardo Date: Mon, 9 Jan 2017 15:53:26 +0000 Subject: [PATCH 1/2] - Added SessionState close(); --- .../jobtype/HadoopSecureHiveWrapper.java | 23 +++++++++++++++---- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/plugins/jobtype/src/azkaban/jobtype/HadoopSecureHiveWrapper.java b/plugins/jobtype/src/azkaban/jobtype/HadoopSecureHiveWrapper.java index 3dabc643..0a54e975 100644 --- a/plugins/jobtype/src/azkaban/jobtype/HadoopSecureHiveWrapper.java +++ b/plugins/jobtype/src/azkaban/jobtype/HadoopSecureHiveWrapper.java @@ -157,11 +157,24 @@ public static void runHive(String[] args) throws Exception { cli.setHiveVariables(getHiveVarMap(args)); } - int returnCode = cli.processFile(hiveScript); - if (returnCode != 0) { - logger.warn("Got exception " + returnCode + " from line: " + hiveScript); - throw new HiveQueryExecutionException(returnCode, hiveScript); - } + int returnCode = 0; + try { + returnCode = cli.processFile(hiveScript); + } catch (Exception ex) { + logger.error("Error processing file: ", ex); + + } finally { + logger.info("Closing session state."); + + if (ss != null) + ss.close(); + } + + if (returnCode != 0) { + logger.warn("Got exception " + returnCode + " from line: " + hiveScript); + throw new HiveQueryExecutionException(returnCode, hiveScript); + } + } /** From 684e2badf357cea654562847a96b34afffe73367 Mon Sep 17 00:00:00 2001 From: kardoo Date: Mon, 9 Jan 2017 15:55:44 +0000 Subject: [PATCH 2/2] Update HadoopSecureHiveWrapper.java --- .../jobtype/HadoopSecureHiveWrapper.java | 30 +++++++++---------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/plugins/jobtype/src/azkaban/jobtype/HadoopSecureHiveWrapper.java b/plugins/jobtype/src/azkaban/jobtype/HadoopSecureHiveWrapper.java index 0a54e975..5e2d6ad7 100644 --- a/plugins/jobtype/src/azkaban/jobtype/HadoopSecureHiveWrapper.java +++ b/plugins/jobtype/src/azkaban/jobtype/HadoopSecureHiveWrapper.java @@ -157,22 +157,20 @@ public static void runHive(String[] args) throws Exception { cli.setHiveVariables(getHiveVarMap(args)); } - int returnCode = 0; - try { - returnCode = cli.processFile(hiveScript); - } catch (Exception ex) { - logger.error("Error processing file: ", ex); - - } finally { - logger.info("Closing session state."); - - if (ss != null) - ss.close(); - } - - if (returnCode != 0) { - logger.warn("Got exception " + returnCode + " from line: " + hiveScript); - throw new HiveQueryExecutionException(returnCode, hiveScript); + int returnCode = 0; + try { + returnCode = cli.processFile(hiveScript); + } catch (Exception ex) { + logger.error("Error processing file: ", ex); + } finally { + logger.info("Closing session state."); + if (ss != null) + ss.close(); + } + + if (returnCode != 0) { + logger.warn("Got exception " + returnCode + " from line: " + hiveScript); + throw new HiveQueryExecutionException(returnCode, hiveScript); } }