[2/2] hbase git commit: HBASE-17437 Support specifying a WAL directory outside of the root directory (Yishan Yang and Zach York) HBASE-17588 Remove unused imports brought in by HBASE-17437 (Zach York)
HBASE-17437 Support specifying a WAL directory outside of the root directory (Yishan Yang and Zach York) HBASE-17588 Remove unused imports brought in by HBASE-17437 (Zach York) Signed-off-by: Enis SoztutarProject: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/8f638850 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/8f638850 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/8f638850 Branch: refs/heads/branch-1 Commit: 8f6388503b626e2da9a048ae3f05f4164395bd8d Parents: 753169a Author: Zach York Authored: Wed Jan 11 12:49:20 2017 -0800 Committer: Enis Soztutar Committed: Wed Feb 8 15:01:59 2017 -0800 -- .../src/main/resources/hbase-default.xml| 7 + .../procedure2/store/wal/WALProcedureStore.java | 14 +- .../procedure2/ProcedureTestingUtility.java | 4 +- ...ProcedureWALLoaderPerformanceEvaluation.java | 4 +- .../wal/ProcedureWALPerformanceEvaluation.java | 4 +- .../org/apache/hadoop/hbase/fs/HFileSystem.java | 12 +- .../org/apache/hadoop/hbase/io/WALLink.java | 10 +- .../hadoop/hbase/master/AssignmentManager.java | 10 +- .../org/apache/hadoop/hbase/master/HMaster.java | 6 +- .../hadoop/hbase/master/MasterFileSystem.java | 138 ++--- .../hadoop/hbase/master/SplitLogManager.java| 2 +- .../hadoop/hbase/regionserver/HRegion.java | 2 +- .../hbase/regionserver/HRegionServer.java | 47 -- .../hbase/regionserver/SplitLogWorker.java | 8 +- .../hadoop/hbase/regionserver/wal/FSHLog.java | 8 +- .../regionserver/ReplicationSource.java | 6 +- .../regionserver/ReplicationSyncUp.java | 10 +- .../org/apache/hadoop/hbase/util/FSUtils.java | 59 +++- .../hadoop/hbase/wal/DefaultWALProvider.java| 18 +-- .../hadoop/hbase/wal/DisabledWALProvider.java | 2 +- .../apache/hadoop/hbase/wal/WALSplitter.java| 14 +- .../hadoop/hbase/HBaseTestingUtility.java | 58 ++-- .../hbase/coprocessor/TestWALObserver.java | 13 +- .../hbase/filter/TestFilterFromRegionSide.java | 2 +- .../hadoop/hbase/fs/TestBlockReorder.java | 16 +- .../encoding/TestSeekBeforeWithReverseScan.java | 2 +- .../hadoop/hbase/mapreduce/TestWALPlayer.java | 16 +- .../hbase/mapreduce/TestWALRecordReader.java| 19 ++- .../master/TestMasterFileSystemWithWALDir.java | 59 .../procedure/TestWALProcedureStoreOnHDFS.java | 2 +- .../regionserver/TestHRegionServerBulkLoad.java | 2 +- .../TestCompactedHFilesDischarger.java | 2 +- .../hbase/regionserver/wal/TestFSHLog.java | 31 ++-- .../regionserver/wal/TestLogRollAbort.java | 8 +- .../wal/TestWALActionsListener.java | 25 +++- .../hbase/regionserver/wal/TestWALReplay.java | 105 +++-- .../apache/hadoop/hbase/util/TestFSUtils.java | 51 ++- .../apache/hadoop/hbase/wal/IOTestProvider.java | 2 +- .../hbase/wal/TestDefaultWALProvider.java | 18 ++- .../apache/hadoop/hbase/wal/TestWALFactory.java | 10 +- .../apache/hadoop/hbase/wal/TestWALRootDir.java | 148 +++ .../apache/hadoop/hbase/wal/TestWALSplit.java | 11 +- .../hbase/wal/WALPerformanceEvaluation.java | 2 +- 43 files changed, 728 insertions(+), 259 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/8f638850/hbase-common/src/main/resources/hbase-default.xml -- diff --git a/hbase-common/src/main/resources/hbase-default.xml b/hbase-common/src/main/resources/hbase-default.xml index c96bc35..147e243 100644 --- a/hbase-common/src/main/resources/hbase-default.xml +++ b/hbase-common/src/main/resources/hbase-default.xml @@ -1145,6 +1145,13 @@ possible configurations would overwhelm and obscure the important. if it does not match. +hbase.wal.dir.perms +700 +FS Permissions for the root WAL directory in a secure(kerberos) setup. + When master starts, it creates the WAL dir with this permissions or sets the permissions + if it does not match. + + hbase.data.umask.enable false Enable, if true, that file permissions should be assigned http://git-wip-us.apache.org/repos/asf/hbase/blob/8f638850/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java -- diff --git a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java index f06270a..e125c6a 100644 ---
[2/2] hbase git commit: HBASE-17437 Support specifying a WAL directory outside of the root directory (Yishan Yang and Zach York)
HBASE-17437 Support specifying a WAL directory outside of the root directory (Yishan Yang and Zach York) Signed-off-by: Enis SoztutarProject: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/ae217973 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/ae217973 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/ae217973 Branch: refs/heads/master Commit: ae21797305188e82f7017ce5675e4fde950461aa Parents: bd7c958 Author: Zach York Authored: Wed Jan 11 12:49:20 2017 -0800 Committer: Enis Soztutar Committed: Tue Jan 31 11:43:33 2017 -0800 -- .../src/main/resources/hbase-default.xml| 7 + .../procedure2/store/wal/WALProcedureStore.java | 14 +- .../procedure2/ProcedureTestingUtility.java | 4 +- ...ProcedureWALLoaderPerformanceEvaluation.java | 4 +- .../wal/ProcedureWALPerformanceEvaluation.java | 4 +- .../org/apache/hadoop/hbase/fs/HFileSystem.java | 12 +- .../org/apache/hadoop/hbase/io/WALLink.java | 10 +- .../hadoop/hbase/master/AssignmentManager.java | 11 +- .../org/apache/hadoop/hbase/master/HMaster.java | 6 +- .../hadoop/hbase/master/MasterFileSystem.java | 58 ++-- .../hadoop/hbase/master/MasterWalManager.java | 4 +- .../hadoop/hbase/master/SplitLogManager.java| 2 +- .../hbase/regionserver/HRegionServer.java | 47 -- .../hbase/regionserver/SplitLogWorker.java | 9 +- .../hadoop/hbase/regionserver/wal/FSHLog.java | 5 +- .../regionserver/ReplicationSource.java | 7 +- .../regionserver/ReplicationSyncUp.java | 10 +- .../org/apache/hadoop/hbase/util/FSUtils.java | 62 +++- .../hadoop/hbase/wal/AbstractFSWALProvider.java | 4 +- .../hadoop/hbase/wal/AsyncFSWALProvider.java| 2 +- .../hadoop/hbase/wal/DisabledWALProvider.java | 3 +- .../apache/hadoop/hbase/wal/FSHLogProvider.java | 2 +- .../apache/hadoop/hbase/wal/WALSplitter.java| 5 +- .../hadoop/hbase/HBaseTestingUtility.java | 47 +- .../hbase/coprocessor/TestWALObserver.java | 14 +- .../hadoop/hbase/mapreduce/TestWALPlayer.java | 17 ++- .../hbase/mapreduce/TestWALRecordReader.java| 18 ++- .../master/TestMasterFileSystemWithWALDir.java | 60 .../procedure/TestMasterProcedureWalLease.java | 4 +- .../procedure/TestWALProcedureStoreOnHDFS.java | 2 +- .../regionserver/TestHRegionServerBulkLoad.java | 2 +- .../regionserver/wal/AbstractTestFSWAL.java | 40 ++--- .../hbase/regionserver/wal/TestFSHLog.java | 8 +- .../regionserver/wal/TestLogRollAbort.java | 9 +- .../wal/TestWALActionsListener.java | 17 ++- .../apache/hadoop/hbase/util/TestFSUtils.java | 49 ++ .../apache/hadoop/hbase/wal/IOTestProvider.java | 2 +- .../apache/hadoop/hbase/wal/TestWALFactory.java | 10 +- .../apache/hadoop/hbase/wal/TestWALRootDir.java | 148 +++ .../apache/hadoop/hbase/wal/TestWALSplit.java | 12 +- 40 files changed, 605 insertions(+), 146 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/ae217973/hbase-common/src/main/resources/hbase-default.xml -- diff --git a/hbase-common/src/main/resources/hbase-default.xml b/hbase-common/src/main/resources/hbase-default.xml index dfa3270..0324bd5 100644 --- a/hbase-common/src/main/resources/hbase-default.xml +++ b/hbase-common/src/main/resources/hbase-default.xml @@ -1204,6 +1204,13 @@ possible configurations would overwhelm and obscure the important. if it does not match. +hbase.wal.dir.perms +700 +FS Permissions for the root WAL directory in a secure(kerberos) setup. + When master starts, it creates the WAL dir with this permissions or sets the permissions + if it does not match. + + hbase.data.umask.enable false Enable, if true, that file permissions should be assigned http://git-wip-us.apache.org/repos/asf/hbase/blob/ae217973/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java -- diff --git a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java index 5042554..1841aa4 100644 --- a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java +++ b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java @@ -123,7 +123,7 @@ public class WALProcedureStore extends ProcedureStoreBase { private final LeaseRecovery leaseRecovery; private final Configuration