HADOOP-14942. DistCp#cleanup() should check whether jobFS is null. Contributed by Andras Bokor.
(cherry picked from commit f36cbc847560d53e7955ced9ce7ce2773c805793) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/2bacb429 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/2bacb429 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/2bacb429 Branch: refs/heads/resource-types Commit: 2bacb429a16dc626d3620062d674c4d0fb07db37 Parents: ea149c1 Author: Steve Loughran <[email protected]> Authored: Fri Oct 20 22:29:22 2017 +0100 Committer: Steve Loughran <[email protected]> Committed: Fri Oct 20 22:29:22 2017 +0100 ---------------------------------------------------------------------- .../src/main/java/org/apache/hadoop/tools/DistCp.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/2bacb429/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCp.java ---------------------------------------------------------------------- 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 df9c328..909494b 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 @@ -453,10 +453,12 @@ public class DistCp extends Configured implements Tool { private synchronized void cleanup() { try { - if (metaFolder == null) return; - - jobFS.delete(metaFolder, true); - metaFolder = null; + if (metaFolder != null) { + if (jobFS != null) { + jobFS.delete(metaFolder, true); + } + metaFolder = null; + } } catch (IOException e) { LOG.error("Unable to cleanup meta folder: " + metaFolder, e); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
