You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by aa...@apache.org on 2021/05/26 05:49:59 UTC
[hadoop] branch branch-3.3 updated: HDFS-16031. Possible Resource
Leak in org.apache.hadoop.hdfs.server.aliasmap#InMemoryAliasMap (#3027)
This is an automated email from the ASF dual-hosted git repository.
aajisaka pushed a commit to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.3 by this push:
new 41025cd HDFS-16031. Possible Resource Leak in org.apache.hadoop.hdfs.server.aliasmap#InMemoryAliasMap (#3027)
41025cd is described below
commit 41025cd5857267ed538769087d4d03c8c782587b
Author: Narges Shadab <54...@users.noreply.github.com>
AuthorDate: Tue May 25 22:43:41 2021 -0700
HDFS-16031. Possible Resource Leak in org.apache.hadoop.hdfs.server.aliasmap#InMemoryAliasMap (#3027)
(cherry picked from commit 3fdeb7435add3593a0a367fff6e8622a73ad9fa3)
---
.../hdfs/server/aliasmap/InMemoryAliasMap.java | 20 +++++++-------------
1 file changed, 7 insertions(+), 13 deletions(-)
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/aliasmap/InMemoryAliasMap.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/aliasmap/InMemoryAliasMap.java
index bcf5357..4060b78 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/aliasmap/InMemoryAliasMap.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/aliasmap/InMemoryAliasMap.java
@@ -320,21 +320,15 @@ public class InMemoryAliasMap implements InMemoryAliasMapProtocol,
private static File getCompressedAliasMap(File aliasMapDir)
throws IOException {
File outCompressedFile = new File(aliasMapDir.getParent(), TAR_NAME);
- BufferedOutputStream bOut = null;
- GzipCompressorOutputStream gzOut = null;
- TarArchiveOutputStream tOut = null;
- try {
- bOut = new BufferedOutputStream(
- Files.newOutputStream(outCompressedFile.toPath()));
- gzOut = new GzipCompressorOutputStream(bOut);
- tOut = new TarArchiveOutputStream(gzOut);
+
+ try (BufferedOutputStream bOut = new BufferedOutputStream(
+ Files.newOutputStream(outCompressedFile.toPath()));
+ GzipCompressorOutputStream gzOut = new GzipCompressorOutputStream(bOut);
+ TarArchiveOutputStream tOut = new TarArchiveOutputStream(gzOut)){
+
addFileToTarGzRecursively(tOut, aliasMapDir, "", new Configuration());
- } finally {
- if (tOut != null) {
- tOut.finish();
- }
- IOUtils.cleanupWithLogger(null, tOut, gzOut, bOut);
}
+
return outCompressedFile;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org