This is an automated email from the ASF dual-hosted git repository.
zyork pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hbase-operator-tools.git
The following commit(s) were added to refs/heads/master by this push:
new e1a48ef HBASE-26054 Fix hbase-operator-tools build with HBase 2.4.4
(#90)
e1a48ef is described below
commit e1a48ef50a6eb2289616b8b6c22a9ca4789576cb
Author: z-york <[email protected]>
AuthorDate: Tue Jul 6 13:18:27 2021 -0700
HBASE-26054 Fix hbase-operator-tools build with HBase 2.4.4 (#90)
Signed-off-by: Michael Stack <[email protected]>
Signed-off-by: Viraj Jasani <[email protected]>
Signed-off-by: Stephen Wu <[email protected]>
---
hbase-hbck2/pom.xml | 6 ++++++
hbase-hbck2/src/main/java/org/apache/hbase/hbck1/HBaseFsck.java | 5 +++--
pom.xml | 1 +
3 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/hbase-hbck2/pom.xml b/hbase-hbck2/pom.xml
index 620c0c3..82b0cd0 100644
--- a/hbase-hbck2/pom.xml
+++ b/hbase-hbck2/pom.xml
@@ -235,6 +235,12 @@
<version>2.1.0</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.github.stephenc.findbugs</groupId>
+ <artifactId>findbugs-annotations</artifactId>
+ <version>${findbugs-annotations.version}</version>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
<profiles>
diff --git a/hbase-hbck2/src/main/java/org/apache/hbase/hbck1/HBaseFsck.java
b/hbase-hbck2/src/main/java/org/apache/hbase/hbck1/HBaseFsck.java
index 8e019b8..d77264e 100644
--- a/hbase-hbck2/src/main/java/org/apache/hbase/hbck1/HBaseFsck.java
+++ b/hbase-hbck2/src/main/java/org/apache/hbase/hbck1/HBaseFsck.java
@@ -167,7 +167,7 @@ import
org.apache.hbase.thirdparty.com.google.common.collect.Multimap;
import org.apache.hbase.thirdparty.com.google.common.collect.Ordering;
import org.apache.hbase.thirdparty.com.google.common.collect.Sets;
import org.apache.hbase.thirdparty.com.google.common.collect.TreeMultimap;
-
+import
org.apache.hbase.thirdparty.com.google.common.util.concurrent.ThreadFactoryBuilder;
/**
* HBaseFsck (hbck) is(WAS) a tool for checking and repairing region
consistency and
@@ -384,7 +384,8 @@ public class HBaseFsck extends Configured implements
Closeable {
private static ExecutorService createThreadPool(Configuration conf) {
int numThreads = conf.getInt("hbasefsck.numthreads", MAX_NUM_THREADS);
return new ScheduledThreadPoolExecutor(numThreads,
- Threads.newDaemonThreadFactory("hbasefsck"));
+ new ThreadFactoryBuilder().setNameFormat("hbasefsck-%d")
+
.setUncaughtExceptionHandler(Threads.LOGGING_EXCEPTION_HANDLER).build());
}
/**
diff --git a/pom.xml b/pom.xml
index 529c828..74f0ff3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -136,6 +136,7 @@
<hbase.checkstyle.version>2.2.0</hbase.checkstyle.version>
<enforcer.version>3.0.0-M2</enforcer.version>
<extra.enforcer.version>1.0-beta-9</extra.enforcer.version>
+ <findbugs-annotations.version>1.3.9-1</findbugs-annotations.version>
</properties>
<dependencyManagement>
<dependencies>
