Skip to content

HADOOP-16341. ShutDownHookManager: Regressed performance on Hook remo… #940

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

Closed
t3rmin4t0r wants to merge 3 commits into from
Closed

HADOOP-16341. ShutDownHookManager: Regressed performance on Hook remo… #940

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1799a47
HADOOP-16341. ShutDownHookManager: Regressed performance on Hook remo…
t3rmin4t0r Jun 3, 2019
8252370
Fix the checkstyle issue
t3rmin4t0r Jun 12, 2019
82f7342
Fix the ws issue
t3rmin4t0r Jun 13, 2019
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: 6 additions & 2 deletions ...ommon-project/hadoop-common/src/main/java/org/apache/hadoop/util/ShutdownHookManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,9 @@ public boolean removeShutdownHook(Runnable shutdownHook) {
throw new IllegalStateException("Shutdown in progress, cannot remove a " +
"shutdownHook");
}
return hooks.remove(new HookEntry(shutdownHook, 0));
// hooks are only == by runnable
return hooks.remove(new HookEntry(shutdownHook, 0, TIMEOUT_MINIMUM,
TIME_UNIT_DEFAULT));
}

/**
Expand All @@ -354,7 +356,9 @@ public boolean removeShutdownHook(Runnable shutdownHook) {
@InterfaceAudience.Public
@InterfaceStability.Stable
public boolean hasShutdownHook(Runnable shutdownHook) {
return hooks.contains(new HookEntry(shutdownHook, 0));
// hooks are only == by runnable
return hooks.remove(new HookEntry(shutdownHook, 0, TIMEOUT_MINIMUM,
TIME_UNIT_DEFAULT));
}

/**
Expand Down
15 changes: 15 additions & 0 deletions ...n-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestShutdownHookManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,21 @@ public void shutdownHookManager() {
mgr.getShutdownHooksInOrder().size());
}

@Test
public void testShutdownRemove() throws Throwable {
ShutdownHookManager mgr = ShutdownHookManager.get();
assertNotNull("No ShutdownHookManager", mgr);
assertEquals(0, mgr.getShutdownHooksInOrder().size());
Hook hook1 = new Hook("hook1", 0, false);
Hook hook2 = new Hook("hook2", 0, false);
mgr.addShutdownHook(hook1, 9); // create Hook1 with priority 9
assertTrue(mgr.hasShutdownHook(hook1)); // hook1 lookup works
assertEquals(1, mgr.getShutdownHooksInOrder().size()); // 1 hook
assertFalse(mgr.removeShutdownHook(hook2)); // can't delete hook2
assertTrue(mgr.removeShutdownHook(hook1)); // can delete hook1
assertEquals(0, mgr.getShutdownHooksInOrder().size()); // no more hooks
}

@Test
public void testShutdownTimeoutConfiguration() throws Throwable {
// set the shutdown timeout and verify it can be read back.
Expand Down