You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2009/05/11 19:32:24 UTC
svn commit: r773627 - in /hadoop/hbase/trunk: ./
src/java/org/apache/hadoop/hbase/regionserver/
Author: stack
Date: Mon May 11 17:32:24 2009
New Revision: 773627
URL: http://svn.apache.org/viewvc?rev=773627&view=rev
Log:
HBASE-1404 minor edit of regionserver logging messages
Modified:
hadoop/hbase/trunk/CHANGES.txt
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HLog.java
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegion.java
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/MemcacheFlusher.java
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/Store.java
Modified: hadoop/hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=773627&r1=773626&r2=773627&view=diff
==============================================================================
--- hadoop/hbase/trunk/CHANGES.txt (original)
+++ hadoop/hbase/trunk/CHANGES.txt Mon May 11 17:32:24 2009
@@ -220,6 +220,7 @@
HBASE-1397 Better distribution in the PerformanceEvaluation MapReduce
when rows run to the Billions
HBASE-1393 Narrow synchronization in HLog
+ HBASE-1404 minor edit of regionserver logging messages
OPTIMIZATIONS
Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HLog.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HLog.java?rev=773627&r1=773626&r2=773627&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HLog.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HLog.java Mon May 11 17:32:24 2009
@@ -545,6 +545,11 @@
}
}
}
+ long took = System.currentTimeMillis() - now;
+ if (took > 1000) {
+ LOG.warn(Thread.currentThread().getName() + " took " + took +
+ "ms optional sync'ing HLog");
+ }
}
}
@@ -730,7 +735,7 @@
// Check for possibly empty file. With appends, currently Hadoop reports
// a zero length even if the file has been sync'd. Revisit if
// HADOOP-4751 is committed.
- boolean possiblyEmpty = logfiles[i].getLen() <= 0;
+ long length = logfiles[i].getLen();
HLogKey key = new HLogKey();
HLogEdit val = new HLogEdit();
try {
@@ -807,7 +812,8 @@
fs.delete(logfiles[i].getPath(), true);
}
} catch (IOException e) {
- if (possiblyEmpty) {
+ if (length <= 0) {
+ LOG.warn("Empty log, continuing: " + logfiles[i]);
continue;
}
throw e;
Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegion.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegion.java?rev=773627&r1=773626&r2=773627&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegion.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegion.java Mon May 11 17:32:24 2009
@@ -309,11 +309,6 @@
// Add one to the current maximum sequence id so new edits are beyond.
this.minSequenceId = maxSeqId + 1;
- if (LOG.isDebugEnabled()) {
- LOG.debug("Next sequence id for region " +
- Bytes.toString(regionInfo.getRegionName()) + " is " +
- this.minSequenceId);
- }
// Get rid of any splits or merges that were lost in-progress
FSUtils.deleteDirectory(this.fs, new Path(regiondir, SPLITDIR));
@@ -328,7 +323,7 @@
this.writestate.compacting = false;
this.lastFlushTime = System.currentTimeMillis();
LOG.info("region " + this + "/" + this.regionInfo.getEncodedName() +
- " available");
+ " available; sequence id is " + this.minSequenceId);
}
/*
@@ -742,8 +737,8 @@
return splitRow;
}
}
- LOG.info("starting " + (majorCompaction? "major" : "") +
- " compaction on region " + this);
+ LOG.info("Starting" + (majorCompaction? " major " : " ") +
+ "compaction on region " + this);
long startTime = System.currentTimeMillis();
doRegionCompactionPrep();
long maxSize = -1;
@@ -1315,8 +1310,9 @@
byte [] row = b.getRow();
// If we did not pass an existing row lock, obtain a new one
Integer lid = getLock(lockid, row);
+ long now = System.currentTimeMillis();
long commitTime = b.getTimestamp() == LATEST_TIMESTAMP?
- System.currentTimeMillis(): b.getTimestamp();
+ now: b.getTimestamp();
Set<byte []> latestTimestampDeletes = null;
List<KeyValue> edits = new ArrayList<KeyValue>();
try {
Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/MemcacheFlusher.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/MemcacheFlusher.java?rev=773627&r1=773626&r2=773627&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/MemcacheFlusher.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/MemcacheFlusher.java Mon May 11 17:32:24 2009
@@ -222,16 +222,18 @@
* not flushed.
*/
private boolean flushRegion(HRegion region, boolean removeFromQueue) {
- // Wait until it is safe to flush
+ // Wait until it is safe to flush.
+ // TODO: Fix. This block doesn't work if more than one store.
int count = 0;
boolean triggered = false;
while (count++ < (blockingWaitTime / 500)) {
for (Store hstore: region.stores.values()) {
- if (hstore.getStorefilesCount() > this.blockingStoreFilesNumber) {
+ int files = hstore.getStorefilesCount();
+ if (files > this.blockingStoreFilesNumber) {
if (!triggered) {
server.compactSplitThread.compactionRequested(region, getName());
- LOG.info("Too many store files for region " + region + ": " +
- hstore.getStorefilesCount() + ", waiting");
+ LOG.info("Too many store files in store " + hstore + ": " +
+ files + ", pausing");
triggered = true;
}
try {
@@ -243,8 +245,7 @@
}
}
if (triggered) {
- LOG.info("Compaction completed on region " + region +
- ", proceeding");
+ LOG.info("Compaction triggered on region " + region + ", proceeding");
}
break;
}
Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/Store.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/Store.java?rev=773627&r1=773626&r2=773627&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/Store.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/Store.java Mon May 11 17:32:24 2009
@@ -204,10 +204,6 @@
// loadStoreFiles calculates this.maxSeqId. as side-effect.
this.storefiles.putAll(loadStoreFiles());
- if (LOG.isDebugEnabled() && this.storefiles.size() > 0) {
- LOG.debug("Loaded " + this.storefiles.size() + " file(s) in Store " +
- Bytes.toString(this.storeName) + ", max sequence id " + this.maxSeqId);
- }
// Do reconstruction log.
runReconstructionLog(reconstructionLog, this.maxSeqId, reporter);
@@ -699,9 +695,9 @@
// Move the compaction into place.
completeCompaction(filesToCompact, writer);
if (LOG.isDebugEnabled()) {
- LOG.debug("Completed " + (majorcompaction? "major": "") +
- " compaction of " + this.storeNameStr +
- " store size is " + StringUtils.humanReadableInt(storeSize));
+ LOG.debug("Completed" + (majorcompaction? " major ": " ") +
+ "compaction of " + this.storeNameStr +
+ "; store size is " + StringUtils.humanReadableInt(storeSize));
}
}
return checkSplit(forceSplit);