Repository: tez Updated Branches: refs/heads/master fc4cddf7c -> 241a7fab9
TEZ-3712. Use Local FileContext for deleting dag level directories (Kuhu Shukla via jeagles) Project: http://git-wip-us.apache.org/repos/asf/tez/repo Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/241a7fab Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/241a7fab Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/241a7fab Branch: refs/heads/master Commit: 241a7fab996835163936d148f6fabea7a1537b70 Parents: fc4cddf Author: Jonathan Eagles <[email protected]> Authored: Tue May 30 15:42:04 2017 -0500 Committer: Jonathan Eagles <[email protected]> Committed: Tue May 30 15:42:04 2017 -0500 ---------------------------------------------------------------------- .../main/java/org/apache/tez/auxservices/ShuffleHandler.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tez/blob/241a7fab/tez-plugins/tez-aux-services/src/main/java/org/apache/tez/auxservices/ShuffleHandler.java ---------------------------------------------------------------------- diff --git a/tez-plugins/tez-aux-services/src/main/java/org/apache/tez/auxservices/ShuffleHandler.java b/tez-plugins/tez-aux-services/src/main/java/org/apache/tez/auxservices/ShuffleHandler.java index abce716..a4d1495 100644 --- a/tez-plugins/tez-aux-services/src/main/java/org/apache/tez/auxservices/ShuffleHandler.java +++ b/tez-plugins/tez-aux-services/src/main/java/org/apache/tez/auxservices/ShuffleHandler.java @@ -55,9 +55,8 @@ import java.util.regex.Pattern; import javax.crypto.SecretKey; import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.fs.FileSystem; +import org.apache.hadoop.fs.FileContext; import org.apache.hadoop.fs.LocalDirAllocator; -import org.apache.hadoop.fs.LocalFileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.io.DataInputByteBuffer; import org.apache.hadoop.io.DataOutputBuffer; @@ -1110,9 +1109,9 @@ public class ShuffleHandler extends AuxiliaryService { && dagIdQ != null && !dagIdQ.isEmpty()) { String base = getDagLocation(jobQ.get(0), dagIdQ.get(0), userRsrc.get(jobQ.get(0))); try { - LocalFileSystem lfs = FileSystem.getLocal(conf); + FileContext lfc = FileContext.getLocalFSFileContext(); for(Path dagPath : lDirAlloc.getAllLocalPathsToRead(base, conf)) { - lfs.delete(dagPath, true); + lfc.delete(dagPath, true); } } catch (IOException e) { LOG.warn("Encountered exception during dag delete "+ e);
