Repository: hbase Updated Branches: refs/heads/0.98 52ecd11e6 -> 1bb55d86e
HBASE-12782 ITBLL fails for me if generator does anything but 5M per maptask Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/1bb55d86 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/1bb55d86 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/1bb55d86 Branch: refs/heads/0.98 Commit: 1bb55d86ecbb4523e5ac5f08dc7ad7b2fbec68ac Parents: 52ecd11 Author: stack <[email protected]> Authored: Fri Jan 30 17:08:47 2015 -0800 Committer: stack <[email protected]> Committed: Fri Jan 30 17:08:47 2015 -0800 ---------------------------------------------------------------------- .../org/apache/hadoop/hbase/regionserver/HRegion.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/1bb55d86/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java index 5dabf8d..b1efc74 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java @@ -1631,7 +1631,7 @@ public class HRegion implements HeapSize { // , Writable{ */ boolean shouldFlush() { // This is a rough measure. - if (this.completeSequenceId > 0 + if (this.completeSequenceId > 0 && (this.completeSequenceId + this.flushPerChanges < this.sequenceId.get())) { return true; } @@ -2752,7 +2752,7 @@ public class HRegion implements HeapSize { // , Writable{ if (this.getCoprocessorHost() != null) { Boolean processed = null; if (w instanceof Put) { - processed = this.getCoprocessorHost().preCheckAndPutAfterRowLock(row, family, + processed = this.getCoprocessorHost().preCheckAndPutAfterRowLock(row, family, qualifier, compareOp, comparator, (Put) w); } else if (w instanceof Delete) { processed = this.getCoprocessorHost().preCheckAndDeleteAfterRowLock(row, family, @@ -3087,7 +3087,7 @@ public class HRegion implements HeapSize { // , Writable{ Store store = getStore(family); int listSize = cells.size(); for (int i=0; i < listSize; i++) { - Cell cell = cells.get(i); + Cell cell = cells.get(i); KeyValue kv = KeyValueUtil.ensureKeyValue(cell); kv.setMvccVersion(localizedWriteEntry.getWriteNumber()); size += store.add(kv); @@ -3482,9 +3482,7 @@ public class HRegion implements HeapSize { // , Writable{ // Once we are over the limit, restoreEdit will keep returning true to // flush -- but don't flush until we've played all the kvs that make up // the WALEdit. - if (!flush) { - flush = restoreEdit(store, kv); - } + flush |= restoreEdit(store, cell); editsCount++; } if (flush) {
