hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject hbase git commit: Archive dir setting
Date Fri, 12 May 2017 22:56:16 GMT
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 <stack@apache.org>
Authored: Fri May 12 15:56:10 2017 -0700
Committer: Michael Stack <stack@apache.org>
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
@@ -1111,8 +1111,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));


Mime
View raw message