[41/50] [abbrv] hbase git commit: Archive dir setting

[stack]

Archive dir setting


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/de32b5e7
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/de32b5e7
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/de32b5e7

Branch: refs/heads/HBASE-14614
Commit: de32b5e7a9dc3b8c4dcb2c13f7c4b471bd3e7d56
Parents: d523dec
Author: Michael Stack 
Authored: Fri May 12 15:56:10 2017 -0700
Committer: Michael Stack 
Committed: Tue May 23 08:36:53 2017 -0700

--
 .../src/main/java/org/apache/hadoop/hbase/master/HMaster.java| 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/de32b5e7/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
index d1fe35e..65e2de9 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
@@ -1163,8 +1163,8 @@ public class HMaster extends HRegionServer implements 
MasterServices {
 final MasterProcedureEnv procEnv = new MasterProcedureEnv(this);
 final Path walDir = new Path(FSUtils.getWALRootDir(this.conf),
 MasterProcedureConstants.MASTER_PROCEDURE_LOGDIR);
-final Path walArchiveDir = new Path(new 
Path(FSUtils.getWALRootDir(this.conf),
-HConstants.HFILE_ARCHIVE_DIRECTORY), 
MasterProcedureConstants.MASTER_PROCEDURE_LOGDIR);
+final Path walArchiveDir = new 
Path(HFileArchiveUtil.getArchivePath(this.conf),
+MasterProcedureConstants.MASTER_PROCEDURE_LOGDIR);
 
 final FileSystem walFs = walDir.getFileSystem(conf);
 

[49/50] [abbrv] hbase git commit: Archive dir setting

[stack]

Archive dir setting


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/8d70a717
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/8d70a717
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/8d70a717

Branch: refs/heads/HBASE-14614
Commit: 8d70a7175118ca73fe133a2314d377e5b16ee04f
Parents: c443308
Author: Michael Stack 
Authored: Fri May 12 15:56:10 2017 -0700
Committer: Michael Stack 
Committed: Tue May 23 00:33:03 2017 -0700

--
 .../src/main/java/org/apache/hadoop/hbase/master/HMaster.java| 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/8d70a717/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
index 39e1e6e..90c9533 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
@@ -1163,8 +1163,8 @@ public class HMaster extends HRegionServer implements 
MasterServices {
 final MasterProcedureEnv procEnv = new MasterProcedureEnv(this);
 final Path walDir = new Path(FSUtils.getWALRootDir(this.conf),
 MasterProcedureConstants.MASTER_PROCEDURE_LOGDIR);
-final Path walArchiveDir = new Path(new 
Path(FSUtils.getWALRootDir(this.conf),
-HConstants.HFILE_ARCHIVE_DIRECTORY), 
MasterProcedureConstants.MASTER_PROCEDURE_LOGDIR);
+final Path walArchiveDir = new 
Path(HFileArchiveUtil.getArchivePath(this.conf),
+MasterProcedureConstants.MASTER_PROCEDURE_LOGDIR);
 
 final FileSystem walFs = walDir.getFileSystem(conf);
 

hbase git commit: Archive dir setting

[stack]

Repository: hbase
Updated Branches:
  refs/heads/HBASE-14614 7e4e547e2 -> f209990b5


Archive dir setting


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/f209990b
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/f209990b
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/f209990b

Branch: refs/heads/HBASE-14614
Commit: f209990b59b8a9fafcbac5353a4711d344f99e01
Parents: 7e4e547
Author: Michael Stack 
Authored: Fri May 12 15:56:10 2017 -0700
Committer: Michael Stack 
Committed: Fri May 12 15:56:10 2017 -0700

--
 .../src/main/java/org/apache/hadoop/hbase/master/HMaster.java| 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/f209990b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
index 984afb8..142547d 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
@@ -,8 +,8 @@ public class HMaster extends HRegionServer implements 
MasterServices {
 final MasterProcedureEnv procEnv = new MasterProcedureEnv(this);
 final Path walDir = new Path(FSUtils.getWALRootDir(this.conf),
 MasterProcedureConstants.MASTER_PROCEDURE_LOGDIR);
-final Path walArchiveDir = new Path(new 
Path(FSUtils.getWALRootDir(this.conf),
-HConstants.HFILE_ARCHIVE_DIRECTORY), 
MasterProcedureConstants.MASTER_PROCEDURE_LOGDIR);
+final Path walArchiveDir = new 
Path(HFileArchiveUtil.getArchivePath(this.conf),
+MasterProcedureConstants.MASTER_PROCEDURE_LOGDIR);
 
 procedureStore = new WALProcedureStore(conf, walDir.getFileSystem(conf), 
walDir, walArchiveDir,
 new MasterProcedureEnv.WALStoreLeaseRecovery(this));