HBASE-15150 Fix TestDurablity in branch-1.1 (Yu Li)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/7ecba62c Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/7ecba62c Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/7ecba62c Branch: refs/heads/branch-1.1 Commit: 7ecba62c47563f0c37194e31281becf0cca8a4ce Parents: b3d1ee4 Author: stack <st...@apache.org> Authored: Thu Jan 21 14:38:22 2016 -0800 Committer: stack <st...@apache.org> Committed: Thu Jan 21 14:38:22 2016 -0800 ---------------------------------------------------------------------- .../main/java/org/apache/hadoop/hbase/regionserver/HRegion.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/7ecba62c/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 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; } /**