From 0b2acb72747265b4738c971dc2ddcbd7845c3efc Mon Sep 17 00:00:00 2001 From: liuxiaocs7 Date: Tue, 12 May 2026 05:05:02 +0800 Subject: [PATCH 1/2] HBASE-30155 MobFileCleanerChore does not shut down its internal executor on cleanup --- .../hadoop/hbase/mob/MobFileCleanerChore.java | 7 ++- .../hbase/mob/TestMobFileCleanerChore.java | 51 +++++++++++++++++++ 2 files changed, 56 insertions(+), 2 deletions(-) create mode 100644 hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestMobFileCleanerChore.java 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 3f9413bfe4d2..f7251e6479e4 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 @@ -19,7 +19,6 @@ import static org.apache.hadoop.hbase.mob.MobConstants.DEFAULT_MOB_FILE_CLEANER_CHORE_TIME_OUT; import static org.apache.hadoop.hbase.mob.MobConstants.MOB_FILE_CLEANER_CHORE_TIME_OUT; - import com.google.errorprone.annotations.RestrictedApi; import java.io.IOException; import java.util.ArrayList; @@ -43,7 +42,6 @@ import org.apache.yetus.audience.InterfaceAudience; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - import org.apache.hbase.thirdparty.com.google.common.util.concurrent.ThreadFactoryBuilder; /** @@ -200,6 +198,11 @@ private void resizeThreadPool(int newCoreSize, int newMaxSize) { } } + @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 000000000000..71ef9d4559a9 --- /dev/null +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestMobFileCleanerChore.java @@ -0,0 +1,51 @@ +/* + * 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()); + } +} From 9f78984a25648e4988ecdeb4e07fcde21c2c73cd Mon Sep 17 00:00:00 2001 From: liuxiaocs7 Date: Tue, 12 May 2026 05:07:11 +0800 Subject: [PATCH 2/2] spotless --- .../java/org/apache/hadoop/hbase/mob/MobFileCleanerChore.java | 2 ++ .../org/apache/hadoop/hbase/mob/TestMobFileCleanerChore.java | 1 + 2 files changed, 3 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 f7251e6479e4..724b69c2422e 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 @@ -19,6 +19,7 @@ import static org.apache.hadoop.hbase.mob.MobConstants.DEFAULT_MOB_FILE_CLEANER_CHORE_TIME_OUT; import static org.apache.hadoop.hbase.mob.MobConstants.MOB_FILE_CLEANER_CHORE_TIME_OUT; + import com.google.errorprone.annotations.RestrictedApi; import java.io.IOException; import java.util.ArrayList; @@ -42,6 +43,7 @@ import org.apache.yetus.audience.InterfaceAudience; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import org.apache.hbase.thirdparty.com.google.common.util.concurrent.ThreadFactoryBuilder; /** 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 71ef9d4559a9..c2878a189aa6 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 @@ -21,6 +21,7 @@ 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;