You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2020/05/30 08:12:35 UTC
[hbase] branch branch-2 updated: HBASE-23716 MasterFileSystem should not create MasterProcWALs dir on … (#1078)
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2 by this push:
new aca7f6f HBASE-23716 MasterFileSystem should not create MasterProcWALs dir on … (#1078)
aca7f6f is described below
commit aca7f6fcf30965028f54a90c4da01378f708d8ff
Author: Wellington Ramos Chevreuil <wc...@apache.org>
AuthorDate: Thu Jan 23 09:25:31 2020 +0000
HBASE-23716 MasterFileSystem should not create MasterProcWALs dir on … (#1078)
Signed-off-by: Josh Elser <el...@apache.org>
---
.../main/java/org/apache/hadoop/hbase/master/MasterFileSystem.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
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 72a5462..42a433e 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
@@ -38,7 +38,6 @@ import org.apache.hadoop.hbase.exceptions.DeserializationException;
import org.apache.hadoop.hbase.fs.HFileSystem;
import org.apache.hadoop.hbase.log.HBaseMarkers;
import org.apache.hadoop.hbase.mob.MobConstants;
-import org.apache.hadoop.hbase.procedure2.store.wal.WALProcedureStore;
import org.apache.hadoop.hbase.regionserver.HRegion;
import org.apache.hadoop.hbase.security.access.SnapshotScannerHDFSAclHelper;
import org.apache.hadoop.hbase.util.Bytes;
@@ -144,11 +143,12 @@ public class MasterFileSystem {
MobConstants.MOB_DIR_NAME
};
+ //With the introduction of RegionProcedureStore,
+ // there's no need to create MasterProcWAL dir here anymore. See HBASE-23715
final String[] protectedSubLogDirs = new String[] {
HConstants.HREGION_LOGDIR_NAME,
HConstants.HREGION_OLDLOGDIR_NAME,
- HConstants.CORRUPT_DIR_NAME,
- WALProcedureStore.MASTER_PROCEDURE_LOGDIR
+ HConstants.CORRUPT_DIR_NAME
};
// check if the root directory exists
checkRootDir(this.rootdir, conf, this.fs);