Skip to content

YARN-12049. Shut down the thread pool in FederationRMAdminInterceptor #8887

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
luoyuan3471 wants to merge 1 commit into
base: trunk
Choose a base branch
from
Open

YARN-12049. Shut down the thread pool in FederationRMAdminInterceptor #8887

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .../main/java/org/apache/hadoop/yarn/server/router/rmadmin/FederationRMAdminInterceptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -855,6 +855,14 @@ public ThreadPoolExecutor getExecutorService() {
return executorService;
}

@Override
public void shutdown() {
if (executorService != null) {
executorService.shutdown();
}
super.shutdown();
}

/**
* In YARN Federation mode, We allow users to mark subClusters
* With no heartbeat for a long time as SC_LOST state.
Expand Down
22 changes: 22 additions & 0 deletions ...t/java/org/apache/hadoop/yarn/server/router/rmadmin/TestFederationRMAdminInterceptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,12 @@
import java.util.Set;
import java.util.HashSet;
import java.util.Random;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;

/**
Expand Down Expand Up @@ -187,6 +190,25 @@ public void tearDown() {
super.tearDown();
}

@Test
public void testShutdownThreadPool() throws Exception {
ThreadPoolExecutor executor = interceptor.getExecutorService();
try {
executor.submit(() -> { }).get(5, TimeUnit.SECONDS);
interceptor.shutdown();
assertTrue(executor.isShutdown());
assertTrue(executor.awaitTermination(5, TimeUnit.SECONDS));
interceptor.shutdown();
} finally {
executor.shutdownNow();
}
}

@Test
public void testShutdownBeforeInit() {
new FederationRMAdminInterceptor().shutdown();
}

@Test
public void testRefreshQueues() throws Exception {
// We will test 2 cases:
Expand Down
Loading