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:28:53 UTC

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

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

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

commit cd97d1a452c63434bfc0ed0ff0ec8fec901a1383
Author: Bharath Vissapragada <bh...@apache.org>
AuthorDate: Mon Aug 10 17:21:05 2020 -0700

    Revert "HBASE-21905 (addendum): Address compaction races in TestFIFOCompactionPolicy (#2203)"
    
    This reverts commit c372ff19cf42cf7aa3df9db744a8eff60577ca3e.
    
    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);
   }