From 1728c372c51feab9f3aed1ee498e9132d659ed8e Mon Sep 17 00:00:00 2001
From: Sadanand Shenoy <sadanand.shenoy@cloudera.com>
Date: Fri, 21 Feb 2025 12:47:06 +0530
Subject: [PATCH] HDDS-10764.Tarball creation failing on leader OM node

---
 .../java/org/apache/hadoop/hdds/utils/HddsServerUtil.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/HddsServerUtil.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/HddsServerUtil.java
index d80b6b3a272c..fc164da36a1f 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/HddsServerUtil.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/HddsServerUtil.java
@@ -637,8 +637,10 @@ public static void includeFile(File file, String entryName,
     archiveOutputStream.putArchiveEntry(archiveEntry);
     try (FileInputStream fis = new FileInputStream(file)) {
       IOUtils.copy(fis, archiveOutputStream);
+      archiveOutputStream.flush();
+    } finally {
+      archiveOutputStream.closeArchiveEntry();
     }
-    archiveOutputStream.closeArchiveEntry();
   }
 
   // Mark tarball completed.