This is an automated email from the ASF dual-hosted git repository.
liuxiaocs7 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 2b137435071 HBASE-30155 MobFileCleanerChore does not shut down its
internal execu… (#8222) (#8254)
2b137435071 is described below
commit 2b13743507197c38804518bf83c7a25a1df41466
Author: Xiao Liu <[email protected]>
AuthorDate: Tue May 19 22:51:31 2026 +0800
HBASE-30155 MobFileCleanerChore does not shut down its internal execu…
(#8222) (#8254)
Signed-off-by: Duo Zhang <[email protected]>
(cherry picked from commit 4294ef690e93c62b57fc00234679967136fa447c)
---
.../hadoop/hbase/mob/MobFileCleanerChore.java | 5 +++
.../hadoop/hbase/mob/TestMobFileCleanerChore.java | 52 ++++++++++++++++++++++
2 files changed, 57 insertions(+)
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/mob/MobFileCleanerChore.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/mob/MobFileCleanerChore.java
index 595078230b3..480a6be7c8c 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/mob/MobFileCleanerChore.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/mob/MobFileCleanerChore.java
@@ -205,6 +205,11 @@ public class MobFileCleanerChore extends ScheduledChore
implements Configuration
}
}
+ @Override
+ protected void cleanup() {
+ executor.shutdownNow();
+ }
+
@RestrictedApi(explanation = "Should only be called in tests", link = "",
allowedOnPath = ".*/src/test/.*")
public ThreadPoolExecutor getExecutor() {
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
new file mode 100644
index 00000000000..c2878a189aa
--- /dev/null
+++
b/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestMobFileCleanerChore.java
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.hbase.mob;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hbase.ServerName;
+import org.apache.hadoop.hbase.master.HMaster;
+import org.apache.hadoop.hbase.testclassification.MasterTests;
+import org.apache.hadoop.hbase.testclassification.SmallTests;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+
+@Tag(MasterTests.TAG)
+@Tag(SmallTests.TAG)
+public class TestMobFileCleanerChore {
+
+ @Test
+ public void testShutdownCleansUpExecutor() {
+ 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);
+ assertFalse(chore.getExecutor().isShutdown());
+
+ chore.shutdown();
+
+ assertTrue(chore.getExecutor().isShutdown());
+ }
+}
