From aca7f6fcf30965028f54a90c4da01378f708d8ff 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-23716=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 --- .../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 72a5462dc03..42a433e3206 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);