From d6ac8b34eb4c327f885c198c828d4d504a808a41 Mon Sep 17 00:00:00 2001 From: Wellington Ramos Chevreuil Date: Thu, 23 Jan 2020 09:25:31 +0000 Subject: [PATCH] =?UTF-8?q?HBASE-23715=20MasterFileSystem=20should=20not?= =?UTF-8?q?=20create=20MasterProcWALs=20dir=20on=20=E2=80=A6=20(#1078)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Josh Elser --- .../java/org/apache/hadoop/hbase/master/MasterFileSystem.java | 4 ++-- 1 file changed, 2 insertions(+), 2 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 21a94956ea6..d36e5250b29 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 @@ -39,7 +39,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.replication.ReplicationUtils; import org.apache.hadoop.hbase.security.access.SnapshotScannerHDFSAclHelper; @@ -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, ReplicationUtils.REMOTE_WAL_DIR_NAME }; // check if the root directory exists