[hbase] branch branch-2 updated: HBASE-26041 Replace PrintThreadInfoHelper with HBase's own ReflectionUtils.printThreadInfo() (#3442)

[zhangduo]

This is an automated email from the ASF dual-hosted git repository.

zhangduo pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/branch-2 by this push:
     new 3d4a0df  HBASE-26041 Replace PrintThreadInfoHelper with HBase's own 
ReflectionUtils.printThreadInfo() (#3442)
3d4a0df is described below

commit 3d4a0dff6e713a29d178c65f6d2c280b4bc45262
Author: Wei-Chiu Chuang <weic...@apache.org>
AuthorDate: Thu Jul 1 18:46:17 2021 -0700

    HBASE-26041 Replace PrintThreadInfoHelper with HBase's own 
ReflectionUtils.printThreadInfo() (#3442)
    
    Signed-off-by: Michael Stack <st...@apache.org>
    Signed-off-by: Duo Zhang <zhang...@apache.org>
---
 .../apache/hadoop/hbase/util/ReflectionUtils.java  |  2 +-
 .../java/org/apache/hadoop/hbase/util/Threads.java | 73 +---------------------
 2 files changed, 2 insertions(+), 73 deletions(-)

diff --git 
a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/ReflectionUtils.java 
b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/ReflectionUtils.java
index 1ffe7df..0fa90ad 100644
--- 
a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/ReflectionUtils.java
+++ 
b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/ReflectionUtils.java
@@ -143,7 +143,7 @@ public class ReflectionUtils {
    * @param stream the stream to
    * @param title a string title for the stack trace
    */
-  private static void printThreadInfo(PrintStream stream,
+  static void printThreadInfo(PrintStream stream,
                                      String title) {
     final int STACK_DEPTH = 20;
     boolean contention = threadBean.isThreadContentionMonitoringEnabled();
diff --git 
a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Threads.java 
b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Threads.java
index 55fc66b..ebbaded 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Threads.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Threads.java
@@ -18,25 +18,17 @@
  */
 package org.apache.hadoop.hbase.util;
 
-import java.io.OutputStreamWriter;
 import java.io.PrintStream;
-import java.io.PrintWriter;
 import java.lang.Thread.UncaughtExceptionHandler;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.nio.charset.StandardCharsets;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
-import org.apache.hadoop.util.ReflectionUtils;
 import org.apache.hadoop.util.StringUtils;
 import org.apache.yetus.audience.InterfaceAudience;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.apache.hbase.thirdparty.com.google.common.base.Preconditions;
-
 /**
  * Thread Utility
  */
@@ -194,68 +186,6 @@ public class Threads {
     t.setUncaughtExceptionHandler(LOGGING_EXCEPTION_HANDLER);
   }
 
-  private interface PrintThreadInfoHelper {
-
-    void printThreadInfo(PrintStream stream, String title);
-
-  }
-
-  private static class PrintThreadInfoLazyHolder {
-
-    public static final PrintThreadInfoHelper HELPER = initHelper();
-
-    private static PrintThreadInfoHelper initHelper() {
-      Method method = null;
-      try {
-        // Hadoop 2.7+ declares printThreadInfo(PrintStream, String)
-        method = ReflectionUtils.class.getMethod("printThreadInfo", 
PrintStream.class,
-          String.class);
-        method.setAccessible(true);
-        final Method hadoop27Method = method;
-        return new PrintThreadInfoHelper() {
-
-          @Override
-          public void printThreadInfo(PrintStream stream, String title) {
-            try {
-              hadoop27Method.invoke(null, stream, title);
-            } catch (IllegalAccessException | IllegalArgumentException e) {
-              throw new RuntimeException(e);
-            } catch (InvocationTargetException e) {
-              throw new RuntimeException(e.getCause());
-            }
-          }
-        };
-      } catch (NoSuchMethodException e) {
-        LOG.info(
-          "Can not find hadoop 2.7+ printThreadInfo method, try hadoop hadoop 
2.6 and earlier", e);
-      }
-      try {
-        // Hadoop 2.6 and earlier declares printThreadInfo(PrintWriter, String)
-        method = ReflectionUtils.class.getMethod("printThreadInfo", 
PrintWriter.class,
-          String.class);
-        method.setAccessible(true);
-        final Method hadoop26Method = method;
-        return new PrintThreadInfoHelper() {
-
-          @Override
-          public void printThreadInfo(PrintStream stream, String title) {
-            try {
-              hadoop26Method.invoke(null, new PrintWriter(
-                  new OutputStreamWriter(stream, StandardCharsets.UTF_8)), 
title);
-            } catch (IllegalAccessException | IllegalArgumentException e) {
-              throw new RuntimeException(e);
-            } catch (InvocationTargetException e) {
-              throw new RuntimeException(e.getCause());
-            }
-          }
-        };
-      } catch (NoSuchMethodException e) {
-        LOG.warn("Cannot find printThreadInfo method. Check hadoop jars 
linked", e);
-      }
-      return null;
-    }
-  }
-
   /**
    * Print all of the thread's information and stack traces. Wrapper around 
Hadoop's method.
    *
@@ -263,7 +193,6 @@ public class Threads {
    * @param title a string title for the stack trace
    */
   public static void printThreadInfo(PrintStream stream, String title) {
-    Preconditions.checkNotNull(PrintThreadInfoLazyHolder.HELPER,
-      "Cannot find method. Check hadoop jars linked").printThreadInfo(stream, 
title);
+    ReflectionUtils.printThreadInfo(stream, title);
   }
 }