[hbase] branch branch-2.2 updated: HBASE-21905 (addendum): Address compaction races in TestFIFOCompactionPolicy (#2203)

[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


The following commit(s) were added to refs/heads/branch-2.2 by this push:
     new 65d8653  HBASE-21905 (addendum): Address compaction races in TestFIFOCompactionPolicy (#2203)
65d8653 is described below

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

    HBASE-21905 (addendum): 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);
   }