Repository: hbase Updated Branches: refs/heads/branch-1.1 15b1f4e09 -> 7ecba62c4
Revert "HBASE-15150 Fix TestDurablity in branch-1.1 (Yu Li)" Revert because I overcommitted. This reverts commit 15b1f4e0957fee77dc20525654e7c9619174517b. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/b3d1ee49 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/b3d1ee49 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/b3d1ee49 Branch: refs/heads/branch-1.1 Commit: b3d1ee49999b819ae9f4a7ccc9389c2b58090d3d Parents: 15b1f4e Author: stack <[email protected]> Authored: Thu Jan 21 14:38:02 2016 -0800 Committer: stack <[email protected]> Committed: Thu Jan 21 14:38:02 2016 -0800 ---------------------------------------------------------------------- .../java/org/apache/hadoop/hbase/regionserver/HRegion.java | 2 +- .../apache/hadoop/hbase/regionserver/wal/TestDurability.java | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/b3d1ee49/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 b40927c..b3b5d22 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 increment.isReturnResults() ? Result.create(allKVs) : null; + return Result.create(allKVs); } /** http://git-wip-us.apache.org/repos/asf/hbase/blob/b3d1ee49/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestDurability.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestDurability.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestDurability.java index a911081..9ac55bc 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestDurability.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestDurability.java @@ -202,9 +202,6 @@ public class TestDurability { byte[] row1 = Bytes.toBytes("row1"); byte[] col1 = Bytes.toBytes("col1"); - // Enable INCREMENT_FAST_BUT_NARROW_CONSISTENCY_KEY - String oldFlag = CONF.get(HRegion.INCREMENT_FAST_BUT_NARROW_CONSISTENCY_KEY); - CONF.setBoolean(HRegion.INCREMENT_FAST_BUT_NARROW_CONSISTENCY_KEY, true); // Setting up region final WALFactory wals = new WALFactory(CONF, null, "testIncrementWithReturnResultsSetToFalse"); byte[] tableName = Bytes.toBytes("testIncrementWithReturnResultsSetToFalse"); @@ -216,10 +213,6 @@ public class TestDurability { inc1.addColumn(FAMILY, col1, 1); Result res = region.increment(inc1); assertNull(res); - // cleanup - if (oldFlag != null) { - CONF.set(HRegion.INCREMENT_FAST_BUT_NARROW_CONSISTENCY_KEY, oldFlag); - } } private Put newPut(Durability durability) {
