You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by je...@apache.org on 2015/09/22 04:35:04 UTC
hbase git commit: Revert: HBASE-14391 Empty regionserver WAL will
never be deleted although the coresponding regionserver has been stale
Repository: hbase
Updated Branches:
refs/heads/branch-1 05bd89b9b -> 73ec3fdd5
Revert: HBASE-14391 Empty regionserver WAL will never be deleted although the coresponding regionserver has been stale
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/73ec3fdd
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/73ec3fdd
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/73ec3fdd
Branch: refs/heads/branch-1
Commit: 73ec3fdd5c64354ae8339baceed4ed0de229712d
Parents: 05bd89b
Author: Jerry He <je...@apache.org>
Authored: Mon Sep 21 19:34:55 2015 -0700
Committer: Jerry He <je...@apache.org>
Committed: Mon Sep 21 19:34:55 2015 -0700
----------------------------------------------------------------------
.../java/org/apache/hadoop/hbase/master/MasterFileSystem.java | 4 ----
1 file changed, 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/73ec3fdd/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 a706bcf..e648c2e 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
@@ -248,10 +248,6 @@ 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(