HIVE-13151 : Clean up UGI objects in FileSystem cache for transactions, ADDENDUM (Wei Zheng, reviewed by Eugene Koifman)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/eda73032 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/eda73032 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/eda73032 Branch: refs/heads/branch-2.0 Commit: eda7303209c2d59428261201c7926904ba127bc3 Parents: 1785ca0 Author: Wei Zheng <w...@apache.org> Authored: Thu Mar 24 22:18:32 2016 -0700 Committer: Wei Zheng <w...@apache.org> Committed: Wed Mar 30 15:10:50 2016 -0700 ---------------------------------------------------------------------- .../java/org/apache/hadoop/hive/ql/txn/compactor/Cleaner.java | 5 +++-- .../java/org/apache/hadoop/hive/ql/txn/compactor/Initiator.java | 4 ++-- ql/src/java/org/apache/hadoop/hive/ql/txn/compactor/Worker.java | 5 +++-- 3 files changed, 8 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/eda73032/ql/src/java/org/apache/hadoop/hive/ql/txn/compactor/Cleaner.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/txn/compactor/Cleaner.java b/ql/src/java/org/apache/hadoop/hive/ql/txn/compactor/Cleaner.java index 974184f..64edfb6 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/txn/compactor/Cleaner.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/txn/compactor/Cleaner.java @@ -227,8 +227,9 @@ public class Cleaner extends CompactorThread { try { FileSystem.closeAllForUGI(ugi); } catch (IOException exception) { - LOG.error("Could not clean up file-system handles for UGI: " + ugi, exception + " for " + - ci.getFullPartitionName()); } + LOG.error("Could not clean up file-system handles for UGI: " + ugi + " for " + + ci.getFullPartitionName(), exception); + } } txnHandler.markCleaned(ci); } catch (Exception e) { http://git-wip-us.apache.org/repos/asf/hive/blob/eda73032/ql/src/java/org/apache/hadoop/hive/ql/txn/compactor/Initiator.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/txn/compactor/Initiator.java b/ql/src/java/org/apache/hadoop/hive/ql/txn/compactor/Initiator.java index 9d71c5a..465896d 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/txn/compactor/Initiator.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/txn/compactor/Initiator.java @@ -222,8 +222,8 @@ public class Initiator extends CompactorThread { try { FileSystem.closeAllForUGI(ugi); } catch (IOException exception) { - LOG.error("Could not clean up file-system handles for UGI: " + ugi, exception + " for " + - ci.getFullPartitionName()); + LOG.error("Could not clean up file-system handles for UGI: " + ugi + " for " + + ci.getFullPartitionName(), exception); } return compactionType; } http://git-wip-us.apache.org/repos/asf/hive/blob/eda73032/ql/src/java/org/apache/hadoop/hive/ql/txn/compactor/Worker.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/txn/compactor/Worker.java b/ql/src/java/org/apache/hadoop/hive/ql/txn/compactor/Worker.java index 8dbe3d4..cdae26f 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/txn/compactor/Worker.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/txn/compactor/Worker.java @@ -175,8 +175,9 @@ public class Worker extends CompactorThread { try { FileSystem.closeAllForUGI(ugi); } catch (IOException exception) { - LOG.error("Could not clean up file-system handles for UGI: " + ugi, exception + " for " + - ci.getFullPartitionName()); } + LOG.error("Could not clean up file-system handles for UGI: " + ugi + " for " + + ci.getFullPartitionName(), exception); + } } txnHandler.markCompacted(ci); } catch (Exception e) {