From 5ab0c62bb85675a3bc80657e749f4eae0070e2cc Mon Sep 17 00:00:00 2001 From: Wellington Chevreuil Date: Tue, 21 Jan 2020 15:43:24 +0000 Subject: [PATCH 1/3] HBASE-23715 MasterFileSystem should not create MasterProcWALs dir on fresh installs --- .../java/org/apache/hadoop/hbase/master/MasterFileSystem.java | 1 - 1 file changed, 1 deletion(-) 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 21a94956ea6f..38f649fffc95 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 @@ -148,7 +148,6 @@ private void createInitialFileSystemLayout() throws IOException { 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 From b9916da3e0ff9d39265248af41ca28140891cb92 Mon Sep 17 00:00:00 2001 From: Wellington Chevreuil Date: Wed, 22 Jan 2020 12:14:56 +0000 Subject: [PATCH 2/3] fixing checkstyle --- .../java/org/apache/hadoop/hbase/master/MasterFileSystem.java | 1 - 1 file changed, 1 deletion(-) 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 38f649fffc95..11e599e5819a 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.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; From 063d7f13d4c06b39ee80218699e9fb0deb0035da Mon Sep 17 00:00:00 2001 From: Wellington Chevreuil Date: Thu, 23 Jan 2020 09:13:59 +0000 Subject: [PATCH 3/3] Added extra comment. --- .../java/org/apache/hadoop/hbase/master/MasterFileSystem.java | 2 ++ 1 file changed, 2 insertions(+) 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 11e599e5819a..d36e5250b29d 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 @@ -143,6 +143,8 @@ 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,