Repository: hbase Updated Branches: refs/heads/branch-1.1 dcf859fcb -> 242594d0b
HBASE-14391 Empty regionserver WAL will never be deleted although the coresponding regionserver has been stale (Qianxi Zhang) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/242594d0 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/242594d0 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/242594d0 Branch: refs/heads/branch-1.1 Commit: 242594d0b65ede977282520b5d4edecf3d2b9e26 Parents: dcf859f Author: Jerry He <jerry...@apache.org> Authored: Mon Sep 21 15:14:28 2015 -0700 Committer: Jerry He <jerry...@apache.org> Committed: Mon Sep 21 15:14:28 2015 -0700 ---------------------------------------------------------------------- .../java/org/apache/hadoop/hbase/master/MasterFileSystem.java | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/242594d0/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterFileSystem.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterFileSystem.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterFileSystem.java index bd2b8f5..c645135 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterFileSystem.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterFileSystem.java @@ -241,6 +241,10 @@ public class MasterFileSystem { FileStatus[] curLogFiles = FSUtils.listStatus(this.fs, status.getPath(), null); if (curLogFiles == null || curLogFiles.length == 0) { // Empty log folder. No recovery needed + // Just delete the directory + if (!fs.delete(status.getPath(), false)) { + LOG.warn("Unable to delete " + status.getPath()); + } continue; } final ServerName serverName = DefaultWALProvider.getServerNameFromWALDirectoryName(
