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:39:41 UTC
[hbase] branch branch-2.3 updated (2a6cbae -> 338e600)
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a change to branch branch-2.3
in repository https://gitbox.apache.org/repos/asf/hbase.git.
from 2a6cbae HBASE-23941 : FilterBy operator support in get_slowlog_responses API (#1793)
new 153bca7 Revert "HBASE-23716 MasterFileSystem should not create MasterProcWALs dir on … (#1078)"
new 338e600 HBASE-23715 MasterFileSystem should not create MasterProcWALs dir on … (#1078)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
[hbase] 01/02: Revert "HBASE-23716 MasterFileSystem should not create MasterProcWALs dir on … (#1078)"
Posted by zh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch branch-2.3
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit 153bca7219426b88cc308df6e98bf11ae1371454
Author: Duo Zhang <zh...@apache.org>
AuthorDate: Sat May 30 16:38:01 2020 +0800
Revert "HBASE-23716 MasterFileSystem should not create MasterProcWALs dir on … (#1078)"
Wrong jira id
This reverts commit 3a872822a00a83babaa462e5e69840e0fc26b4f9.
---
.../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 42a433e..72a5462 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.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;
@@ -143,12 +144,11 @@ 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
+ HConstants.CORRUPT_DIR_NAME,
+ WALProcedureStore.MASTER_PROCEDURE_LOGDIR
};
// check if the root directory exists
checkRootDir(this.rootdir, conf, this.fs);
[hbase] 02/02: HBASE-23715 MasterFileSystem should not create MasterProcWALs dir on … (#1078)
Posted by zh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch branch-2.3
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit 338e600d54462793bb711ed5c03e0b0cc1741da3
Author: Wellington Ramos Chevreuil <wc...@apache.org>
AuthorDate: Thu Jan 23 09:25:31 2020 +0000
HBASE-23715 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);