(hbase) branch branch-2 updated: HBASE-29179: Fall back to hbase.rpc.rows.warning.threshold if hbase.client.write.buffer.maxmutations is not set (#6769)

[ndimiduk]

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

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


The following commit(s) were added to refs/heads/branch-2 by this push:
     new 1274a636238 HBASE-29179: Fall back to hbase.rpc.rows.warning.threshold 
if hbase.client.write.buffer.maxmutations is not set (#6769)
1274a636238 is described below

commit 1274a636238a2102e3b4fe78cc77f5ef1d1a9f05
Author: Charles Connell <cconn...@hubspot.com>
AuthorDate: Fri Mar 14 10:23:00 2025 -0400

    HBASE-29179: Fall back to hbase.rpc.rows.warning.threshold if 
hbase.client.write.buffer.maxmutations is not set (#6769)
    
    Signed-off-by: Nick Dimiduk <ndimi...@apache.org>
---
 .../java/org/apache/hadoop/hbase/client/ConnectionConfiguration.java  | 4 ++--
 hbase-common/src/main/resources/hbase-default.xml                     | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionConfiguration.java
 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionConfiguration.java
index 5a7462ce621..1dfdd994023 100644
--- 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionConfiguration.java
+++ 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionConfiguration.java
@@ -155,8 +155,8 @@ public class ConnectionConfiguration {
 
     this.maxKeyValueSize = conf.getInt(MAX_KEYVALUE_SIZE_KEY, 
MAX_KEYVALUE_SIZE_DEFAULT);
 
-    this.bufferedMutatorMaxMutations =
-      conf.getInt(BUFFERED_MUTATOR_MAX_MUTATIONS_KEY, 
BUFFERED_MUTATOR_MAX_MUTATIONS_DEFAULT);
+    this.bufferedMutatorMaxMutations = 
conf.getInt(BUFFERED_MUTATOR_MAX_MUTATIONS_KEY,
+      conf.getInt(HConstants.BATCH_ROWS_THRESHOLD_NAME, 
BUFFERED_MUTATOR_MAX_MUTATIONS_DEFAULT));
 
     this.rpcTimeout =
       conf.getInt(HConstants.HBASE_RPC_TIMEOUT_KEY, 
HConstants.DEFAULT_HBASE_RPC_TIMEOUT);
diff --git a/hbase-common/src/main/resources/hbase-default.xml 
b/hbase-common/src/main/resources/hbase-default.xml
index 15b970c7e8d..8218201967c 100644
--- a/hbase-common/src/main/resources/hbase-default.xml
+++ b/hbase-common/src/main/resources/hbase-default.xml
@@ -1909,6 +1909,8 @@ possible configurations would overwhelm and obscure the 
important.
     <value>5000</value>
     <description>
       Number of rows in a batch operation above which a warning will be logged.
+      If hbase.client.write.buffer.maxmutations is not set, this will be used 
as
+      fallback for that setting.
     </description>
   </property>
   <property>