commit a28948215ce3ee996e83e2ad91d6aedabe385348 Author: stack Date: Thu Jan 21 10:41:41 2016 -0800 HBASE-15150 Fix TestDurablity in branch-1.1 (Yu Li) 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 b3b5d22..b40927c 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 @@ -7344,7 +7344,7 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi } // Request a cache flush. Do it outside update lock. if (isFlushSize(this.addAndGetGlobalMemstoreSize(accumulatedResultSize))) requestFlush(); - return Result.create(allKVs); + return increment.isReturnResults() ? Result.create(allKVs) : null; } /**