From 1ac00e11cba153380896cab5b618f8e12004e10f Mon Sep 17 00:00:00 2001 From: Duo Zhang Date: Sat, 30 May 2020 16:36:48 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"HBASE-23716=20MasterFileSystem=20shou?= =?UTF-8?q?ld=20not=20create=20MasterProcWALs=20dir=20on=20=E2=80=A6=20(#1?= =?UTF-8?q?078)"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Wrong jira id This reverts commit aca7f6fcf30965028f54a90c4da01378f708d8ff. --- .../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 42a433e32066..72a5462dc036 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,6 +38,7 @@ 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; @@ -143,12 +144,11 @@ private void createInitialFileSystemLayout() throws IOException { 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 + HConstants.CORRUPT_DIR_NAME, + WALProcedureStore.MASTER_PROCEDURE_LOGDIR }; // check if the root directory exists checkRootDir(this.rootdir, conf, this.fs);