From eaaba6d9483892ddb014ecd77b46100cc05c8292 Mon Sep 17 00:00:00 2001
From: liuxiaocs7 <liuxiao2103@qq.com>
Date: Mon, 8 Jun 2026 22:28:15 +0800
Subject: [PATCH 1/2] HBASE-30209 MobFileCleanerChore is not registered for
 online configuration updates

---
 .../apache/hadoop/hbase/master/HMaster.java   |  4 ++++
 .../master/TestMasterChoreScheduled.java      |  7 ++++++
 .../hbase/mob/TestMobFileCleanerChore.java    | 23 +++++++++++++++++++
 3 files changed, 34 insertions(+)

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 df6c616db4ae..668f71c1b7d1 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
@@ -1567,6 +1567,7 @@ public void updateConfigurationForQuotasObserver(Configuration conf) {
 
   private void initMobCleaner() {
     this.mobFileCleanerChore = new MobFileCleanerChore(this);
+    configurationManager.registerObserver(this.mobFileCleanerChore);
     getChoreService().scheduleChore(mobFileCleanerChore);
     this.mobFileCompactionChore = new MobFileCompactionChore(this);
     getChoreService().scheduleChore(mobFileCompactionChore);
@@ -1963,6 +1964,9 @@ private void stopProcedureExecutor() {
   }
 
   protected void stopChores() {
+    if (mobFileCleanerChore != null) {
+      configurationManager.deregisterObserver(mobFileCleanerChore);
+    }
     shutdownChore(mobFileCleanerChore);
     shutdownChore(mobFileCompactionChore);
     shutdownChore(balancerChore);
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterChoreScheduled.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterChoreScheduled.java
index 31da027db024..fe16216385b1 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterChoreScheduled.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterChoreScheduled.java
@@ -32,6 +32,7 @@
 import org.apache.hadoop.hbase.master.cleaner.ReplicationBarrierCleaner;
 import org.apache.hadoop.hbase.master.hbck.HbckChore;
 import org.apache.hadoop.hbase.master.janitor.CatalogJanitor;
+import org.apache.hadoop.hbase.mob.MobFileCleanerChore;
 import org.apache.hadoop.hbase.testclassification.MasterTests;
 import org.apache.hadoop.hbase.testclassification.MediumTests;
 import org.junit.jupiter.api.AfterAll;
@@ -108,6 +109,12 @@ public void testDefaultScheduledChores() throws Exception {
     TestChoreField<HbckChore> hbckChoreTestChoreField = new TestChoreField<>();
     HbckChore hbckChore = hbckChoreTestChoreField.getChoreObj("hbckChore");
     hbckChoreTestChoreField.testIfChoreScheduled(hbckChore);
+
+    TestChoreField<MobFileCleanerChore> mobFileCleanerTestChoreField = new TestChoreField<>();
+    MobFileCleanerChore mobFileCleanerChore =
+      mobFileCleanerTestChoreField.getChoreObj("mobFileCleanerChore");
+    mobFileCleanerTestChoreField.testIfChoreScheduled(mobFileCleanerChore);
+    assertTrue(hMaster.getConfigurationManager().containsObserver(mobFileCleanerChore));
   }
 
   /**
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestMobFileCleanerChore.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestMobFileCleanerChore.java
index c2878a189aa6..da02d8c85da1 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestMobFileCleanerChore.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestMobFileCleanerChore.java
@@ -17,6 +17,7 @@
  */
 package org.apache.hadoop.hbase.mob;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.mock;
@@ -34,6 +35,28 @@
 @Tag(SmallTests.TAG)
 public class TestMobFileCleanerChore {
 
+  @Test
+  public void testOnConfigurationChangeResizesExecutor() {
+    Configuration conf = new Configuration();
+    conf.setInt(MobConstants.MOB_CLEANER_THREAD_COUNT, 2);
+    HMaster master = mock(HMaster.class);
+    when(master.getServerName()).thenReturn(ServerName.valueOf("localhost", 12345, 1));
+    when(master.getConfiguration()).thenReturn(conf);
+
+    MobFileCleanerChore chore = new MobFileCleanerChore(master);
+    assertEquals(2, chore.getExecutor().getCorePoolSize());
+    assertEquals(2, chore.getExecutor().getMaximumPoolSize());
+
+    Configuration newConf = new Configuration(conf);
+    newConf.setInt(MobConstants.MOB_CLEANER_THREAD_COUNT, 4);
+    chore.onConfigurationChange(newConf);
+
+    assertEquals(4, chore.getExecutor().getCorePoolSize());
+    assertEquals(4, chore.getExecutor().getMaximumPoolSize());
+
+    chore.shutdown();
+  }
+
   @Test
   public void testShutdownCleansUpExecutor() {
     Configuration conf = new Configuration();

From 0981bc7050d72ce7374af5f938cd0b89a591e8e0 Mon Sep 17 00:00:00 2001
From: liuxiaocs7 <liuxiao2103@qq.com>
Date: Tue, 9 Jun 2026 10:06:35 +0800
Subject: [PATCH 2/2] address comments

---
 .../src/main/java/org/apache/hadoop/hbase/master/HMaster.java  | 3 ---
 1 file changed, 3 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 668f71c1b7d1..713b416712a0 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
@@ -1964,9 +1964,6 @@ private void stopProcedureExecutor() {
   }
 
   protected void stopChores() {
-    if (mobFileCleanerChore != null) {
-      configurationManager.deregisterObserver(mobFileCleanerChore);
-    }
     shutdownChore(mobFileCleanerChore);
     shutdownChore(mobFileCompactionChore);
     shutdownChore(balancerChore);