diff --git src/main/java/org/apache/hadoop/hbase/HConstants.java src/main/java/org/apache/hadoop/hbase/HConstants.java index 13aff26..fea8606 100644 --- src/main/java/org/apache/hadoop/hbase/HConstants.java +++ src/main/java/org/apache/hadoop/hbase/HConstants.java @@ -130,9 +130,6 @@ public interface HConstants { /** Like the previous, but for old logs that are about to be deleted */ static final String HREGION_OLDLOGDIR_NAME = ".oldlogs"; - /** Name of old log file for reconstruction */ - static final String HREGION_OLDLOGFILE_NAME = "oldlogfile.log"; - /** Used to construct the name of the compaction directory during compaction */ static final String HREGION_COMPACTIONDIR_NAME = "compaction.dir"; diff --git src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java index 2c324cc..7835847 100644 --- src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java +++ src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java @@ -308,7 +308,7 @@ public class HRegion implements HConstants, HeapSize { // , Writable{ */ public void initialize(Path initialFiles, final Progressable reporter) throws IOException { - Path oldLogFile = new Path(regiondir, HREGION_OLDLOGFILE_NAME); + Path oldLogFile = new Path(regiondir, HLog.REGION_RECOVERED_EDITS); moveInitialFilesIntoPlace(this.fs, initialFiles, this.regiondir); diff --git src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java index 9e2d75e..ea4c7fb 100644 --- src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java +++ src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java @@ -142,6 +142,11 @@ public class HLog implements HConstants, Syncable { private Method getNumCurrentReplicas; // refers to DFSOutputStream.getNumCurrentReplicas final static Object [] NO_ARGS = new Object []{}; + /** Name of file that holds recovered edits written by the wal log splitting + * code, one per region + */ + public static final String REGION_RECOVERED_EDITS = "recovered.edits"; + // used to indirectly tell syncFs to force the sync private boolean forceSync = false; @@ -1627,16 +1632,9 @@ public class HLog implements HConstants, Syncable { HTableDescriptor.getTableDir(rootDir, logEntry.getKey().getTablename()); Path regionDir = HRegion.getRegionDir(tableDir, HRegionInfo.encodeRegionName(logEntry.getKey().getRegionName())); - return new Path(regionDir, HREGION_OLDLOGFILE_NAME); + return new Path(regionDir, REGION_RECOVERED_EDITS); } - - - - - - - public void addLogActionsListerner(LogActionsListener list) { LOG.info("Adding a listener"); this.actionListeners.add(list);