From ac6a7bb2107f15326b30e9c824efd87a5db41112 Mon Sep 17 00:00:00 2001
From: niuyulin <niuyulin@xiaomi.com>
Date: Fri, 5 Mar 2021 16:43:19 +0800
Subject: [PATCH] HBASE-25630 Set switch compaction after bulkload default as
 false

---
 hbase-common/src/main/resources/hbase-default.xml              | 2 +-
 .../java/org/apache/hadoop/hbase/regionserver/HRegion.java     | 2 +-
 src/main/asciidoc/_chapters/hbase-default.adoc                 | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/hbase-common/src/main/resources/hbase-default.xml b/hbase-common/src/main/resources/hbase-default.xml
index ae6e18e68791..32ea7933ce47 100644
--- a/hbase-common/src/main/resources/hbase-default.xml
+++ b/hbase-common/src/main/resources/hbase-default.xml
@@ -595,7 +595,7 @@ possible configurations would overwhelm and obscure the important.
   </property>
   <property>
     <name>hbase.compaction.after.bulkload.enable</name>
-    <value>true</value>
+    <value>false</value>
     <description>Request Compaction after bulkload immediately.
       If bulkload is continuous, the triggered compactions may increase load,
       bring about performance side effect.</description>
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 9cbb4e9f0f28..57943b364940 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
@@ -7029,7 +7029,7 @@ public Map<byte[], List<Path>> bulkLoadHFiles(Collection<Pair<byte[], String>> f
       }
 
       isSuccessful = true;
-      if (conf.getBoolean(COMPACTION_AFTER_BULKLOAD_ENABLE, true)) {
+      if (conf.getBoolean(COMPACTION_AFTER_BULKLOAD_ENABLE, false)) {
         // request compaction
         familyWithFinalPath.keySet().forEach(family -> {
           HStore store = getStore(family);
diff --git a/src/main/asciidoc/_chapters/hbase-default.adoc b/src/main/asciidoc/_chapters/hbase-default.adoc
index 449d65fa95e8..83359141db23 100644
--- a/src/main/asciidoc/_chapters/hbase-default.adoc
+++ b/src/main/asciidoc/_chapters/hbase-default.adoc
@@ -763,9 +763,10 @@ Maximum retries. This is a maximum number of iterations
 Request Compaction after bulkload immediately.
 If bulkload is continuous, the triggered compactions may increase load,
 bring about performance side effect.
+(For HBase-2.x, the default value for "hbase.compaction.after.bulkload.enable" is true)
 +
 .Default
-`true`
+`false`
 
 [[hbase.balancer.period
     ]]