Repository: hbase Updated Branches: refs/heads/branch-2 46d993b0a -> 42f140d9f
HBASE-18801 Bulk load cleanup may falsely deem file deletion successful Signed-off-by: tedyu <yuzhih...@gmail.com> Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/42f140d9 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/42f140d9 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/42f140d9 Branch: refs/heads/branch-2 Commit: 42f140d9fb803b17953a1113b251540be9e3f96f Parents: 46d993b Author: Reid Chan <reidddc...@outlook.com> Authored: Thu Sep 14 20:28:17 2017 +0800 Committer: tedyu <yuzhih...@gmail.com> Committed: Thu Sep 14 08:10:18 2017 -0700 ---------------------------------------------------------------------- .../hadoop/hbase/regionserver/SecureBulkLoadManager.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/42f140d9/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SecureBulkLoadManager.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SecureBulkLoadManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SecureBulkLoadManager.java index 85ccc91..66773d0 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SecureBulkLoadManager.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SecureBulkLoadManager.java @@ -170,7 +170,13 @@ public class SecureBulkLoadManager { } } - fs.delete(new Path(request.getBulkToken()), true); + Path path = new Path(request.getBulkToken()); + if (!fs.delete(path, true)) { + if (fs.exists(path)) { + throw new IOException("Failed to clean up " + path); + } + } + LOG.info("Cleaned up " + path + " successfully."); } public Map<byte[], List<Path>> secureBulkLoadHFiles(final Region region,
