Index: src/java/org/apache/hadoop/hbase/regionserver/HRegion.java =================================================================== --- src/java/org/apache/hadoop/hbase/regionserver/HRegion.java (revision 892381) +++ src/java/org/apache/hadoop/hbase/regionserver/HRegion.java (working copy) @@ -182,10 +182,10 @@ private volatile WriteState writestate = new WriteState(); - final int memstoreFlushSize; + final long memstoreFlushSize; private volatile long lastFlushTime; final FlushRequester flushListener; - private final int blockingMemStoreSize; + private final long blockingMemStoreSize; final long threadWakeFrequency; // Used to guard splits and closes private final ReentrantReadWriteLock splitsAndClosesLock = @@ -216,11 +216,11 @@ */ public HRegion(){ this.basedir = null; - this.blockingMemStoreSize = 0; + this.blockingMemStoreSize = 0L; this.conf = null; this.flushListener = null; this.fs = null; - this.memstoreFlushSize = 0; + this.memstoreFlushSize = 0L; this.log = null; this.regionCompactionDir = null; this.regiondir = null; @@ -267,14 +267,14 @@ } this.regionCompactionDir = new Path(getCompactionDir(basedir), encodedNameStr); - int flushSize = regionInfo.getTableDesc().getMemStoreFlushSize(); + long flushSize = regionInfo.getTableDesc().getMemStoreFlushSize(); if (flushSize == HTableDescriptor.DEFAULT_MEMSTORE_FLUSH_SIZE) { - flushSize = conf.getInt("hbase.hregion.memstore.flush.size", + flushSize = conf.getLong("hbase.hregion.memstore.flush.size", HTableDescriptor.DEFAULT_MEMSTORE_FLUSH_SIZE); } this.memstoreFlushSize = flushSize; this.blockingMemStoreSize = this.memstoreFlushSize * - conf.getInt("hbase.hregion.memstore.block.multiplier", 1); + conf.getLong("hbase.hregion.memstore.block.multiplier", 2); } /** Index: src/java/org/apache/hadoop/hbase/HTableDescriptor.java =================================================================== --- src/java/org/apache/hadoop/hbase/HTableDescriptor.java (revision 892381) +++ src/java/org/apache/hadoop/hbase/HTableDescriptor.java (working copy) @@ -91,9 +91,9 @@ public static final boolean DEFAULT_READONLY = false; - public static final int DEFAULT_MEMSTORE_FLUSH_SIZE = 1024*1024*64; + public static final long DEFAULT_MEMSTORE_FLUSH_SIZE = 1024*1024*64L; - public static final int DEFAULT_MAX_FILESIZE = 1024*1024*256; + public static final long DEFAULT_MAX_FILESIZE = 1024*1024*256L; public static final boolean DEFAULT_DEFERRED_LOG_FLUSH = true; @@ -421,7 +421,7 @@ /** * @return memory cache flush size for each hregion */ - public int getMemStoreFlushSize() { + public long getMemStoreFlushSize() { byte [] value = getValue(MEMSTORE_FLUSHSIZE_KEY); if (value != null) return Integer.valueOf(Bytes.toString(value)).intValue();