You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by bh...@apache.org on 2020/08/11 00:42:04 UTC

[hbase] branch branch-2.2 updated (3a38e82 -> 67e03c2)

This is an automated email from the ASF dual-hosted git repository.

bharathv pushed a change to branch branch-2.2
in repository https://gitbox.apache.org/repos/asf/hbase.git.


    from 3a38e82  HBASE-21721 reduce write#syncs() times (#2093)
     new 140a711  Revert "HBASE-21905 (addendum): Address compaction races in TestFIFOCompactionPolicy (#2203)"
     new 67e03c2  HBASE-24846: Address compaction races in TestFIFOCompactionPolicy (#2203)

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:


[hbase] 01/02: Revert "HBASE-21905 (addendum): Address compaction races in TestFIFOCompactionPolicy (#2203)"

Posted by bh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

bharathv pushed a commit to branch branch-2.2
in repository https://gitbox.apache.org/repos/asf/hbase.git

commit 140a7112e8c9419678bdee6e1c3057f57e575314
Author: Bharath Vissapragada <bh...@apache.org>
AuthorDate: Mon Aug 10 17:36:28 2020 -0700

    Revert "HBASE-21905 (addendum): Address compaction races in TestFIFOCompactionPolicy (#2203)"
    
    This reverts commit 65d8653a1e504a419f24d2fa33e1b0974cf2dbb7.
    
    Reverting to apply as HBASE-24846.
---
 .../hbase/regionserver/compactions/TestFIFOCompactionPolicy.java     | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/TestFIFOCompactionPolicy.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/TestFIFOCompactionPolicy.java
index 9fee333..36afd84 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/TestFIFOCompactionPolicy.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/TestFIFOCompactionPolicy.java
@@ -122,11 +122,6 @@ public class TestFIFOCompactionPolicy {
     EnvironmentEdgeManager.injectEdge(ee);
     Configuration conf = TEST_UTIL.getConfiguration();
     conf.setInt(HStore.BLOCKING_STOREFILES_KEY, 10000);
-    // Expired store file deletion during compaction optimization interferes with the FIFO
-    // compaction policy. The race causes changes to in-flight-compaction files resulting in a
-    // non-deterministic number of files selected by compaction policy. Disables that optimization
-    // for this test run.
-    conf.setBoolean("hbase.store.delete.expired.storefile", false);
     TEST_UTIL.startMiniCluster(1);
   }
 


[hbase] 02/02: HBASE-24846: Address compaction races in TestFIFOCompactionPolicy (#2203)

Posted by bh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

bharathv pushed a commit to branch branch-2.2
in repository https://gitbox.apache.org/repos/asf/hbase.git

commit 67e03c263ead6c351c001fd50e2670ec5a0f6a6b
Author: Bharath Vissapragada <bh...@apache.org>
AuthorDate: Thu Aug 6 09:31:41 2020 -0700

    HBASE-24846: Address compaction races in TestFIFOCompactionPolicy (#2203)
    
    Looped through the test 100 times and it passes. Without the patch it fails
    every ~10 runs or so.
    
    Signed-off-by: Viraj Jasani <vj...@apache.org>
    Signed-off-by: Michael Stack <st...@apache.org>
---
 .../hbase/regionserver/compactions/TestFIFOCompactionPolicy.java     | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/TestFIFOCompactionPolicy.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/TestFIFOCompactionPolicy.java
index 36afd84..9fee333 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/TestFIFOCompactionPolicy.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/TestFIFOCompactionPolicy.java
@@ -122,6 +122,11 @@ public class TestFIFOCompactionPolicy {
     EnvironmentEdgeManager.injectEdge(ee);
     Configuration conf = TEST_UTIL.getConfiguration();
     conf.setInt(HStore.BLOCKING_STOREFILES_KEY, 10000);
+    // Expired store file deletion during compaction optimization interferes with the FIFO
+    // compaction policy. The race causes changes to in-flight-compaction files resulting in a
+    // non-deterministic number of files selected by compaction policy. Disables that optimization
+    // for this test run.
+    conf.setBoolean("hbase.store.delete.expired.storefile", false);
     TEST_UTIL.startMiniCluster(1);
   }