big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HADOOP-11876. Refactor code to make it more readable, minor maybePrintStats bug (Zoran Dimitrijevic via raviprak)

Browse Source
This commit is contained in:
Ravi Prakash 2015-04-24 13:39:07 -07:00
parent 80935268f5
commit a287d2fb77
2 changed files with 8 additions and 5 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

@ -561,6 +561,9 @@ Release 2.8.0 - UNRELEASED
HADOOP-11864. JWTRedirectAuthenticationHandler breaks java8 javadocs.
(Larry McCay via stevel)
HADOOP-11876. Refactor code to make it more readable, minor
maybePrintStats bug (Zoran Dimitrijevic via raviprak)
Release 2.7.1 - UNRELEASED
INCOMPATIBLE CHANGES

10
hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/SimpleCopyListing.java
View File

@ -343,11 +343,12 @@ public WorkReport<FileStatus[]> processItem(
}
}
result = new WorkReport<FileStatus[]>(
fileSystem.listStatus(parent.getPath()), 0, true);
fileSystem.listStatus(parent.getPath()), retry, true);
} catch (FileNotFoundException fnf) {
LOG.error("FileNotFoundException exception in listStatus: " +
fnf.getMessage());
result = new WorkReport<FileStatus[]>(new FileStatus[0], 0, true, fnf);
result = new WorkReport<FileStatus[]>(new FileStatus[0], retry, true,
fnf);
} catch (Exception e) {
LOG.error("Exception in listStatus. Will send for retry.");
FileStatus[] parentList = new FileStatus[1];
@ -391,7 +392,6 @@ private void traverseDirectory(SequenceFile.Writer fileListWriter,
for (FileStatus status : sourceDirs) {
workers.put(new WorkRequest<FileStatus>(status, 0));
maybePrintStats();
}
while (workers.hasWork()) {
@ -402,7 +402,7 @@ private void traverseDirectory(SequenceFile.Writer fileListWriter,
if (LOG.isDebugEnabled()) {
LOG.debug("Recording source-path: " + child.getPath() + " for copy.");
}
if (retry == 0) {
if (workResult.getSuccess()) {
CopyListingFileStatus childCopyListingStatus =
DistCpUtils.toCopyListingFileStatus(sourceFS, child,
preserveAcls && child.isDirectory(),
@ -417,7 +417,6 @@ private void traverseDirectory(SequenceFile.Writer fileListWriter,
LOG.debug("Traversing into source dir: " + child.getPath());
}
workers.put(new WorkRequest<FileStatus>(child, retry));
maybePrintStats();
}
} else {
LOG.error("Giving up on " + child.getPath() +
@ -472,5 +471,6 @@ private void writeToFileListing(SequenceFile.Writer fileListWriter,
totalDirs++;
}
totalPaths++;
maybePrintStats();
}
}