possible resource leak in InMemoryAliasMap

Nargeshdb · Nargeshdb · commit 920d33926c81 · 2021-05-19T11:16:09.000-07:00
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
@@ -330,10 +330,13 @@ private static File getCompressedAliasMap(File aliasMapDir)
       tOut = new TarArchiveOutputStream(gzOut);
       addFileToTarGzRecursively(tOut, aliasMapDir, "", new Configuration());
     } finally {
-      if (tOut != null) {
-        tOut.finish();
+      try {
+        if (tOut != null) {
+          tOut.finish();
+        }
+      } finally {
+        IOUtils.cleanupWithLogger(null, tOut, gzOut, bOut);
       }
-      IOUtils.cleanupWithLogger(null, tOut, gzOut, bOut);
     }
     return outCompressedFile;
   }

Original file line number	Diff line number	Diff line change
`@@ -330,10 +330,13 @@ private static File getCompressedAliasMap(File aliasMapDir)`
`330`	`330`	`tOut = new TarArchiveOutputStream(gzOut);`
`331`	`331`	`addFileToTarGzRecursively(tOut, aliasMapDir, "", new Configuration());`
`332`	`332`	`} finally {`
`333`		`- if (tOut != null) {`
`334`		`- tOut.finish();`
	`333`	`+ try {`
	`334`	`+ if (tOut != null) {`
	`335`	`+ tOut.finish();`
	`336`	`+ }`
	`337`	`+ } finally {`
	`338`	`+ IOUtils.cleanupWithLogger(null, tOut, gzOut, bOut);`
`335`	`339`	`}`
`336`		`- IOUtils.cleanupWithLogger(null, tOut, gzOut, bOut);`
`337`	`340`	`}`
`338`	`341`	`return outCompressedFile;`
`339`	`342`	`}`