Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-19822 HFileCleaner threads stick around after shutdown stuck on queue#take Interrupt wait on queue when cancel is called.

This commit is contained in:
Michael Stack 2018-01-18 11:12:31 -08:00
parent 13547d53eb
commit a57769a15c
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.java
View File

@ -231,7 +231,7 @@ public class HFileCleaner extends CleanerChore<BaseHFileCleanerDelegate> {
try { try {
task = queue.take(); task = queue.take();
} catch (InterruptedException e) { } catch (InterruptedException e) {
LOG.debug("Interrupted while trying to take a task from queue", e); LOG.trace("Interrupted while trying to take a task from queue", e);
break; break;
} }
if (task != null) { if (task != null) {
@ -445,4 +445,12 @@ public class HFileCleaner extends CleanerChore<BaseHFileCleanerDelegate> {
} }
return updated; return updated;
} }
@Override
public synchronized void cancel(boolean mayInterruptIfRunning) {
super.cancel(mayInterruptIfRunning);
for (Thread t: this.threads) {
t.interrupt();
}
}
} }