Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-3017 More log pruning 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@999143 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2010-09-20 22:25:54 +00:00
parent 1456bfff76
commit 0cdd2c5eb7
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
View File

@ -283,10 +283,6 @@ public class HRegion implements HeapSize { // , Writable{
10 * 1000);
String encodedNameStr = this.regionInfo.getEncodedName();
this.regiondir = getRegionDir(this.tableDir, encodedNameStr);
if (LOG.isDebugEnabled()) {
// Write out region name as string and its encoded name.
LOG.debug("Creating region " + this);
}
long flushSize = regionInfo.getTableDesc().getMemStoreFlushSize();
if (flushSize == HTableDescriptor.DEFAULT_MEMSTORE_FLUSH_SIZE) {
flushSize = conf.getLong("hbase.hregion.memstore.flush.size",
@ -295,6 +291,10 @@ public class HRegion implements HeapSize { // , Writable{
this.memstoreFlushSize = flushSize;
this.blockingMemStoreSize = this.memstoreFlushSize *
conf.getLong("hbase.hregion.memstore.block.multiplier", 2);
if (LOG.isDebugEnabled()) {
// Write out region name as string and its encoded name.
LOG.debug("Instantiated " + this);
}
}
/**
@ -854,7 +854,7 @@ public class HRegion implements HeapSize { // , Writable{
}
if (LOG.isDebugEnabled()) {
LOG.debug("Started memstore flush for region " + this +
". Current region memstore size " +
"; current region memstore size " +
StringUtils.humanReadableInt(this.memstoreSize.get()) +
((wal != null)? "": "; wal is null, using passed sequenceid=" + myseqid));
}

11
src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
View File

@ -47,6 +47,7 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import org.apache.commons.lang.StringUtils;
import com.google.common.base.Function;
import org.apache.commons.logging.Log;
@ -431,7 +432,7 @@ public class HRegionServer implements HRegionInterface, HBaseRPCErrorHandler,
private void initializeZooKeeper() throws IOException, InterruptedException {
// open connection to zookeeper and set primary watcher
zooKeeper = new ZooKeeperWatcher(conf, REGIONSERVER + ":" +
zooKeeper = new ZooKeeperWatcher(conf, REGIONSERVER +
serverInfo.getServerAddress().getPort(), this);
this.clusterStatusTracker = new ClusterStatusTracker(this.zooKeeper, this);
@ -2314,11 +2315,9 @@ public class HRegionServer implements HRegionInterface, HBaseRPCErrorHandler,
}
}
} catch (IOException ioe) {
if (multi.size() == 1) {
throw ioe;
} else {
LOG.error("Exception found while attempting " + action.toString() +
" " + StringUtils.stringifyException(ioe));
if (multi.size() == 1) throw ioe;
LOG.debug("Exception processing " + StringUtils.abbreviate(action.toString(), 64) +
"; " + ioe.getMessage());
response.add(regionName,null);
// stop processing on this region, continue to the next.
}