HADOOP-16632 Speculating & Partitioned S3A magic committers can leave pending files under __magic (#1599)
Contributed by Steve Loughran. This downgrade the checks for leftover __magic entries from fail to warn now the parallel test runs make speculation more likely. Change-Id: Ia4df2e90f82a06dbae69f3fdaadcbb0e0d713b38
This commit is contained in:
parent
30b2096933
commit
9fbfe6c8f9
|
@ -628,16 +628,18 @@ public class ITestS3ACommitterMRJob extends AbstractYarnClusterITest {
|
|||
S3AFileSystem fs = getRemoteFS();
|
||||
// log the contents
|
||||
lsR(fs, destPath, true);
|
||||
intercept(FileNotFoundException.class, () -> {
|
||||
// and look for the magic directory
|
||||
// HADOOP-16632 shows how partitioned/speculative tasks can leave
|
||||
// data here and it is not an error. So just log and continue
|
||||
try {
|
||||
final FileStatus st = fs.getFileStatus(magicDir);
|
||||
StringBuilder result = new StringBuilder("Found magic dir which should"
|
||||
+ " have been deleted at ").append(st).append('\n');
|
||||
result.append(" [");
|
||||
LOG.warn("Found magic dir which should"
|
||||
+ " have been deleted at {}", st);
|
||||
applyLocatedFiles(fs.listFiles(magicDir, true),
|
||||
(status) -> result.append(" ").append(status.getPath()).append('\n'));
|
||||
result.append("]");
|
||||
return result.toString();
|
||||
});
|
||||
(status) -> LOG.warn("{}", status));
|
||||
} catch (FileNotFoundException ignored) {
|
||||
// expected
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue