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 ay...@apache.org on 2022/07/08 11:34:27 UTC
[hadoop] branch trunk updated: HADOOP-15789. DistCp does not clean staging folder if class extends DistCp. Contributed by Lawrence Andrews. (#4534)
This is an automated email from the ASF dual-hosted git repository.
ayushsaxena pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new 96f8e5b6f49 HADOOP-15789. DistCp does not clean staging folder if class extends DistCp. Contributed by Lawrence Andrews. (#4534)
96f8e5b6f49 is described below
commit 96f8e5b6f4971d9be6da2035d5065d2ca82dd123
Author: Ayush Saxena <ay...@apache.org>
AuthorDate: Fri Jul 8 17:04:20 2022 +0530
HADOOP-15789. DistCp does not clean staging folder if class extends DistCp. Contributed by Lawrence Andrews. (#4534)
Signed-off-by: Ayush Saxena <ay...@apache.org>
---
.../src/main/java/org/apache/hadoop/tools/DistCp.java | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCp.java b/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCp.java
index 892bffa7db9..141f45d61f3 100644
--- a/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCp.java
+++ b/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCp.java
@@ -473,13 +473,18 @@ public class DistCp extends Configured implements Tool {
return config;
}
- private synchronized void cleanup() {
+ /**
+ * Clean the staging folder created by distcp.
+ */
+ protected synchronized void cleanup() {
try {
if (metaFolder != null) {
- if (jobFS != null) {
- jobFS.delete(metaFolder, true);
+ synchronized (this) {
+ if (jobFS != null) {
+ jobFS.delete(metaFolder, true);
+ }
+ metaFolder = null;
}
- metaFolder = null;
}
} catch (IOException e) {
LOG.error("Unable to cleanup meta folder: " + metaFolder, e);
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org