You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2025/09/03 01:46:28 UTC

(hbase) branch master updated (a3558240105 -> 6d739b77a66)

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

zhangduo pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/hbase.git


    from a3558240105 HBAHBASE-28881 Adding check and diagnose log for "hbase.master.procedure.threads" when set to non-positive value (#7267)
     new eadcf941dc8 Revert "HBAHBASE-28881 Adding check and diagnose log for "hbase.master.procedure.threads" when set to non-positive value (#7267)"
     new 6d739b77a66 HBASE-28881 Adding check and diagnose log for "hbase.master.procedure.threads" when set to non-positive value (#7267)

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:


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

Posted by zh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 6d739b77a66be3643128540e1ce711b74d65a5b7
Author: Ariadne-team <36...@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 <zh...@apache.org>
---
 .../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 317f571ba8a..1cda553a81d 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
@@ -1867,8 +1867,15 @@ public class HMaster extends HBaseServerBase<MasterRpcServices> implements Maste
     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);


(hbase) 01/02: Revert "HBAHBASE-28881 Adding check and diagnose log for "hbase.master.procedure.threads" when set to non-positive value (#7267)"

Posted by zh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit eadcf941dc86601dd4b2077cb80b199f508a5fcb
Author: Duo Zhang <zh...@apache.org>
AuthorDate: Wed Sep 3 09:44:00 2025 +0800

    Revert "HBAHBASE-28881 Adding check and diagnose log for "hbase.master.procedure.threads" when set to non-positive value (#7267)"
    
    This reverts commit a355824010560a6cb5c0277e0535e07836193a65.
---
 .../src/main/java/org/apache/hadoop/hbase/master/HMaster.java | 11 ++---------
 1 file changed, 2 insertions(+), 9 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 1cda553a81d..317f571ba8a 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
@@ -1867,15 +1867,8 @@ public class HMaster extends HBaseServerBase<MasterRpcServices> implements Maste
     configurationManager.registerObserver(procEnv);
 
     int cpus = Runtime.getRuntime().availableProcessors();
-    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 int numThreads = conf.getInt(MasterProcedureConstants.MASTER_PROCEDURE_THREADS, Math.max(
+      (cpus > 0 ? cpus / 4 : 0), MasterProcedureConstants.DEFAULT_MIN_MASTER_PROCEDURE_THREADS));
     final boolean abortOnCorruption =
       conf.getBoolean(MasterProcedureConstants.EXECUTOR_ABORT_ON_CORRUPTION,
         MasterProcedureConstants.DEFAULT_EXECUTOR_ABORT_ON_CORRUPTION);