From c7f6c0da12733ee860e8efcce8ed75ca2397564f Mon Sep 17 00:00:00 2001 From: Xiao Liu Date: Mon, 18 May 2026 15:26:40 +0800 Subject: [PATCH] =?UTF-8?q?HBASE-30155=20MobFileCleanerChore=20does=20not?= =?UTF-8?q?=20shut=20down=20its=20internal=20execu=E2=80=A6=20(#8222)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Duo Zhang --- .../hadoop/hbase/mob/MobFileCleanerChore.java | 5 ++ .../hbase/mob/TestMobFileCleanerChore.java | 52 +++++++++++++++++++ 2 files changed, 57 insertions(+) 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 595078230b3a..480a6be7c8c7 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 @@ 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..c2878a189aa6 --- /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()); + } +}