From b4ad81c03d2b13b294dd5f3bd255134536b51e03 Mon Sep 17 00:00:00 2001 From: Reid Chan Date: Fri, 19 Jan 2018 10:49:28 +0800 Subject: [PATCH] HBASE-19822 Override cancel(boolean) in LogCleaner (Addendum) --- .../java/org/apache/hadoop/hbase/master/cleaner/LogCleaner.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/LogCleaner.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/LogCleaner.java index 6e5424f52d..db364eefc8 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/LogCleaner.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/LogCleaner.java @@ -177,6 +177,14 @@ public class LogCleaner extends CleanerChore { } } + @Override + public synchronized void cancel(boolean mayInterruptIfRunning) { + super.cancel(mayInterruptIfRunning); + for (Thread t : oldWALsCleaner) { + t.interrupt(); + } + } + private static final class CleanerContext { // At most waits 60 seconds static final long MAX_WAIT = 60 * 1000; -- 2.15.0