From 62ce1ec2252288e4b42b212b36554619e5922c29 Mon Sep 17 00:00:00 2001 From: Reid Chan Date: Wed, 13 Sep 2017 22:07:26 +0800 Subject: [PATCH] HBASE-18801 Bulk load cleanup may falsely deem file deletion successful --- .../hadoop/hbase/regionserver/SecureBulkLoadManager.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) 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 85ccc910e4..4f7a601e3a 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,15 @@ public class SecureBulkLoadManager { } } - fs.delete(new Path(request.getBulkToken()), true); + Path path = new Path(request.getBulkToken()); + if (fs.exists(path)) { + if (fs.delete(path, true)) { + LOG.info("Cleaned up " + path + " successfully."); + return; + } + throw new IOException("Failed to clean up " + path); + } + LOG.warn(path + " doesn't exist."); } public Map> secureBulkLoadHFiles(final Region region, -- 2.11.0 (Apple Git-81)