(hbase) branch branch-2.6 updated: HBASE-28881 Adding check and diagnose log for "hbase.master.procedure.threads" when set to non-positive value (#7267)

[zhangduo]

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

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


The following commit(s) were added to refs/heads/branch-2.6 by this push:
     new bf25fde27d7 HBASE-28881 Adding check and diagnose log for 
"hbase.master.procedure.threads" when set to non-positive value (#7267)
bf25fde27d7 is described below

commit bf25fde27d73a6e92d9a7fe1a731238e20598d61
Author: Ariadne-team <3631176...@qq.com>
AuthorDate: Wed Sep 3 09:44:29 2025 +0800

    HBASE-28881 Adding check and diagnose log for 
"hbase.master.procedure.threads" when set to non-positive value (#7267)
    
    Signed-off-by: Duo Zhang <zhang...@apache.org>
    (cherry picked from commit 6d739b77a66be3643128540e1ce711b74d65a5b7)
---
 .../src/main/java/org/apache/hadoop/hbase/master/HMaster.java | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
index e099760a7a8..35f212b4459 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
@@ -1803,8 +1803,15 @@ public class HMaster extends HRegionServer implements 
MasterServices {
     configurationManager.registerObserver(procEnv);
 
     int cpus = Runtime.getRuntime().availableProcessors();
-    final int numThreads = 
conf.getInt(MasterProcedureConstants.MASTER_PROCEDURE_THREADS, Math.max(
-      (cpus > 0 ? cpus / 4 : 0), 
MasterProcedureConstants.DEFAULT_MIN_MASTER_PROCEDURE_THREADS));
+    int defaultNumThreads = Math.max((cpus > 0 ? cpus / 4 : 0),
+      MasterProcedureConstants.DEFAULT_MIN_MASTER_PROCEDURE_THREADS);
+    int numThreads =
+      conf.getInt(MasterProcedureConstants.MASTER_PROCEDURE_THREADS, 
defaultNumThreads);
+    if (numThreads <= 0) {
+      LOG.warn("{} is set to {}, which is invalid, using default value {} 
instead",
+        MasterProcedureConstants.MASTER_PROCEDURE_THREADS, numThreads, 
defaultNumThreads);
+      numThreads = defaultNumThreads;
+    }
     final boolean abortOnCorruption =
       conf.getBoolean(MasterProcedureConstants.EXECUTOR_ABORT_ON_CORRUPTION,
         MasterProcedureConstants.DEFAULT_EXECUTOR_ABORT_ON_CORRUPTION);