archive is for hfiles only and the cleaner is removing my pv2 files
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/18eaefb6 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/18eaefb6 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/18eaefb6 Branch: refs/heads/HBASE-14614 Commit: 18eaefb64c02d2b644e6bc9711221edb1be2e737 Parents: de32b5e Author: Michael Stack <st...@apache.org> Authored: Fri May 12 16:25:55 2017 -0700 Committer: Michael Stack <st...@apache.org> Committed: Tue May 23 08:36:53 2017 -0700 ---------------------------------------------------------------------- .../hadoop/hbase/procedure2/store/wal/WALProcedureStore.java | 7 ++++--- .../src/main/java/org/apache/hadoop/hbase/master/HMaster.java | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/18eaefb6/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 b64fd54..1791cae 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 @@ -66,6 +66,7 @@ import com.google.common.annotations.VisibleForTesting; @InterfaceStability.Evolving public class WALProcedureStore extends ProcedureStoreBase { private static final Log LOG = LogFactory.getLog(WALProcedureStore.class); + public static final String LOG_PREFIX = "pv2-"; public interface LeaseRecovery { void recoverFileLease(FileSystem fs, Path path) throws IOException; @@ -1145,7 +1146,7 @@ public class WALProcedureStore extends ProcedureStoreBase { } protected Path getLogFilePath(final long logId) throws IOException { - return new Path(walDir, String.format("state-%020d.log", logId)); + return new Path(walDir, String.format(LOG_PREFIX + "%020d.log", logId)); } private static long getLogIdFromName(final String name) { @@ -1158,7 +1159,7 @@ public class WALProcedureStore extends ProcedureStoreBase { @Override public boolean accept(Path path) { String name = path.getName(); - return name.startsWith("state-") && name.endsWith(".log"); + return name.startsWith(LOG_PREFIX) && name.endsWith(".log"); } }; @@ -1248,7 +1249,7 @@ public class WALProcedureStore extends ProcedureStoreBase { return null; } if (LOG.isDebugEnabled()) { - LOG.debug("Opening state-log: " + logFile); + LOG.debug("Opening Pv2 " + logFile); } try { log.open(); http://git-wip-us.apache.org/repos/asf/hbase/blob/18eaefb6/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 65e2de9..83f5a1c 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,6 +1163,7 @@ 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); + // TODO: No cleaner currently! final Path walArchiveDir = new Path(HFileArchiveUtil.getArchivePath(this.conf), MasterProcedureConstants.MASTER_PROCEDURE_LOGDIR);
