diff --git a/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java b/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java index 3bd20f6..6dc41a4 100644 --- a/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java +++ b/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java @@ -957,7 +957,7 @@ public class HRegion implements HeapSize { // , Writable{ LOG.debug("Started memstore flush for region " + this + ". Current region memstore size " + StringUtils.humanReadableInt(this.memstoreSize.get()) + - ((wal != null)? "": "; wal is null, using passed myseqid=" + myseqid)); + ((wal != null)? "": "; wal is null, using passed sequenceid=" + myseqid)); } // Stop updates while we snapshot the memstore of all stores. We only have @@ -1080,7 +1080,7 @@ public class HRegion implements HeapSize { // , Writable{ long now = EnvironmentEdgeManager.currentTimeMillis(); LOG.info("Finished memstore flush of ~" + StringUtils.humanReadableInt(currentMemStoreSize) + " for region " + - this + " in " + (now - startTime) + "ms, sequence id=" + sequenceId + + this + " in " + (now - startTime) + "ms, sequenceid=" + sequenceId + ", compaction requested=" + compactionRequested + ((wal == null)? "; wal=null": "")); } @@ -1950,7 +1950,7 @@ public class HRegion implements HeapSize { // , Writable{ private long replayRecoveredEdits(final Path edits, final long minSeqId, final Progressable reporter) throws IOException { - LOG.info("Replaying edits from " + edits + "; minSeqId=" + minSeqId); + LOG.info("Replaying edits from " + edits + "; minSequenceid=" + minSeqId); HLog.Reader reader = HLog.getReader(this.fs, edits, conf); try { return replayRecoveredEdits(reader, minSeqId, reporter); @@ -2026,8 +2026,8 @@ public class HRegion implements HeapSize { // , Writable{ } if (LOG.isDebugEnabled()) { LOG.debug("Applied " + editsCount + ", skipped " + skippedEdits + - ", firstSeqIdInLog=" + firstSeqIdInLog + - ", maxSeqIdInLog=" + currentEditSeqId); + ", firstSequenceidInLog=" + firstSeqIdInLog + + ", maxSequenceidInLog=" + currentEditSeqId); } return currentEditSeqId; } @@ -2573,9 +2573,8 @@ public class HRegion implements HeapSize { // , Writable{ HTableDescriptor.getTableDir(rootDir, info.getTableDesc().getName()), log, FileSystem.get(conf), conf, info, null); long seqid = r.initialize(); - if (log != null) { - log.setSequenceNumber(seqid); - } + // If seqid > current wal seqid, the wal seqid is updated. + if (log != null) log.setSequenceNumber(seqid); return r; } diff --git a/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java b/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java index b7cadd7..592e17b 100644 --- a/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java +++ b/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java @@ -1492,10 +1492,8 @@ public class HRegionServer implements HRegionInterface, addProcessingMessage(regionInfo); } }); - // If a wal and its seqid is < that of new region, use new regions seqid. - if (wal != null) { - if (seqid > wal.getSequenceNumber()) wal.setSequenceNumber(seqid); - } + // If seqid > current wal seqid, the wal seqid is updated. + if (wal != null) wal.setSequenceNumber(seqid); return r; } diff --git a/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java b/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java index 5688c03..9593286 100644 --- a/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java +++ b/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java @@ -397,7 +397,7 @@ public class HLog implements Syncable { !this.logSeqNum.compareAndSet(id, newvalue); id = this.logSeqNum.get()) { // This could spin on occasion but better the occasional spin than locking // every increment of sequence number. - LOG.debug("Change sequence number from " + logSeqNum + " to " + newvalue); + LOG.debug("Changed sequenceid from " + logSeqNum + " to " + newvalue); } } @@ -475,7 +475,7 @@ public class HLog implements Syncable { // Can we delete any of the old log files? if (this.outputfiles.size() > 0) { if (this.lastSeqWritten.size() <= 0) { - LOG.debug("Last sequence written is empty. Deleting all old hlogs"); + LOG.debug("Last sequenceid written is empty. Deleting all old hlogs"); // If so, then no new writes have come in since all regions were // flushed (and removed from the lastSeqWritten map). Means can // remove all but currently open log file. @@ -569,7 +569,7 @@ public class HLog implements Syncable { byte [] oldestRegion = getOldestRegion(oldestOutstandingSeqNum); LOG.debug("Found " + logsToRemove + " hlogs to remove " + " out of total " + this.outputfiles.size() + "; " + - "oldest outstanding seqnum is " + oldestOutstandingSeqNum + + "oldest outstanding sequenceid is " + oldestOutstandingSeqNum + " from region " + Bytes.toString(oldestRegion)); } for (Long seq : sequenceNumbers) { @@ -669,7 +669,7 @@ public class HLog implements Syncable { private void archiveLogFile(final Path p, final Long seqno) throws IOException { Path newPath = getHLogArchivePath(this.oldLogDir, p); LOG.info("moving old hlog file " + FSUtils.getPath(p) + - " whose highest sequence/edit id is " + seqno + " to " + + " whose highest sequenceid is " + seqno + " to " + FSUtils.getPath(newPath)); this.fs.rename(p, newPath); }