Merge pull request #245 from metamx/s3-retry-fix

Fix S3DataSegmentPuller retry bug
This commit is contained in:
fjy 2013-09-25 15:32:18 -07:00
commit 713ba63306
1 changed files with 10 additions and 1 deletions

View File

@ -110,7 +110,6 @@ public class S3DataSegmentPuller implements DataSegmentPuller
return null;
}
catch (IOException e) {
FileUtils.deleteDirectory(outDir);
throw new IOException(String.format("Problem decompressing object[%s]", s3Obj), e);
}
finally {
@ -125,6 +124,16 @@ public class S3DataSegmentPuller implements DataSegmentPuller
);
}
catch (Exception e) {
try {
FileUtils.deleteDirectory(outDir);
} catch (IOException ioe) {
log.warn(
ioe,
"Failed to remove output directory for segment[%s] after exception: %s",
segment.getIdentifier(),
outDir
);
}
throw new SegmentLoadingException(e, e.getMessage());
}
}