Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-11724. DistCp throws NPE when the target directory is root. (Lei Eddy Xu via Yongjun Zhang)

This commit is contained in:
Yongjun Zhang 2015-03-25 15:45:45 -07:00
parent fc1031af74
commit 44809b8081
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -469,6 +469,9 @@ Release 2.8.0 - UNRELEASED
HADOOP-10027. *Compressor_deflateBytesDirect passes instance instead of HADOOP-10027. *Compressor_deflateBytesDirect passes instance instead of
jclass to GetStaticObjectField. (Hui Zheng via cnauroth) jclass to GetStaticObjectField. (Hui Zheng via cnauroth)
HADOOP-11724. DistCp throws NPE when the target directory is root.
(Lei Eddy Xu via Yongjun Zhang)
Release 2.7.0 - UNRELEASED Release 2.7.0 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

3
hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/CopyCommitter.java
View File

@ -133,6 +133,9 @@ private void cleanupTempFiles(JobContext context) {
private void deleteAttemptTempFiles(Path targetWorkPath, private void deleteAttemptTempFiles(Path targetWorkPath,
FileSystem targetFS, FileSystem targetFS,
String jobId) throws IOException { String jobId) throws IOException {
if (targetWorkPath == null) {
return;
}
FileStatus[] tempFiles = targetFS.globStatus( FileStatus[] tempFiles = targetFS.globStatus(
new Path(targetWorkPath, ".distcp.tmp." + jobId.replaceAll("job","attempt") + "*")); new Path(targetWorkPath, ".distcp.tmp." + jobId.replaceAll("job","attempt") + "*"));