From e9c4109004ca378806f167ed580b57fd0d191fd4 Mon Sep 17 00:00:00 2001
From: Nanda kumar <nanda@apache.org>
Date: Thu, 11 Apr 2019 05:25:37 +0530
Subject: [PATCH] HDDS-1417. After successfully importing a container, datanode
 should delete the container tar.gz file from working directory. (#721)

---
 .../container/replication/DownloadAndImportReplicator.java | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/replication/DownloadAndImportReplicator.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/replication/DownloadAndImportReplicator.java
index 3100a684caf..eef01a13f2f 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/replication/DownloadAndImportReplicator.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/replication/DownloadAndImportReplicator.java
@@ -95,13 +95,12 @@ public void importContainer(long containerID, Path tarFilePath) {
       LOG.error(
           "Can't import the downloaded container data id=" + containerID,
           e);
+    } finally {
       try {
         Files.delete(tarFilePath);
       } catch (Exception ex) {
-        LOG.error(
-            "Container import is failed and the downloaded file can't be "
-                + "deleted: "
-                + tarFilePath.toAbsolutePath().toString());
+        LOG.error("Got exception while deleting downloaded container file: "
+            + tarFilePath.toAbsolutePath().toString(), ex);
       }
     }
   }