Merge pull request #43 from qunarcorp/hot-fix

Hot fix
qunarcorp · Sep 10, 2019 · 2738daf · 2738daf
2 parents 2642ca0 + 03b6e81
commit 2738daf
Show file tree

Hide file tree

Showing 62 changed files with 642 additions and 367 deletions.
diff --git a/README.md b/README.md
@@ -36,6 +36,7 @@ Bistoury提供可视化页面实时查看机器和应用的各种信息，包括
 
 ## 使用文档
 - [快速开始](docs/cn/quick_start.md)
+- [git及maven配置](docs/cn/gitlab_maven.md)
 - [在线debug](docs/cn/debug.md)
 - [线程级cpu使用率监控](docs/cn/jstack.md)
 - [命令使用文档](docs/cn/commands.md)

diff --git a/bistoury-agent-common/pom.xml b/bistoury-agent-common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>bistoury</artifactId>
         <groupId>qunar.tc.bistoury</groupId>
-        <version>2.0.5</version>
+        <version>2.0.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/bistoury-agent-task/pom.xml b/bistoury-agent-task/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>bistoury</artifactId>
         <groupId>qunar.tc.bistoury</groupId>
-        <version>2.0.5</version>
+        <version>2.0.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/bistoury-agent/pom.xml b/bistoury-agent/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>bistoury</artifactId>
         <groupId>qunar.tc.bistoury</groupId>
-        <version>2.0.5</version>
+        <version>2.0.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/bistoury-application/bistoury-application-api/pom.xml b/bistoury-application/bistoury-application-api/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>bistoury-application</artifactId>
 		<groupId>qunar.tc.bistoury</groupId>
-		<version>2.0.5</version>
+		<version>2.0.6</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

diff --git a/bistoury-application/bistoury-application-mysql/pom.xml b/bistoury-application/bistoury-application-mysql/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>bistoury-application</artifactId>
         <groupId>qunar.tc.bistoury</groupId>
-        <version>2.0.5</version>
+        <version>2.0.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/bistoury-application/pom.xml b/bistoury-application/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>bistoury</artifactId>
 		<groupId>qunar.tc.bistoury</groupId>
-		<version>2.0.5</version>
+		<version>2.0.6</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

diff --git a/bistoury-attach-arthas/pom.xml b/bistoury-attach-arthas/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>bistoury</artifactId>
         <groupId>qunar.tc.bistoury</groupId>
-        <version>2.0.5</version>
+        <version>2.0.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/...ury-attach-arthas/src/main/java/qunar/tc/bistoury/attach/arthas/debug/JarDebugClient.java b/...ury-attach-arthas/src/main/java/qunar/tc/bistoury/attach/arthas/debug/JarDebugClient.java
@@ -51,15 +51,15 @@ public class JarDebugClient implements InstrumentClient {
 
     private static final String FILE_PROTOCOL = "file:";
 
-    private Map<String, ClassInfo> class_classInfo = Maps.newHashMap();
+    private final InstrumentInfo instrumentInfo;
 
-    private InstrumentInfo instrumentInfo;
+    private volatile Map<String, ClassInfo> classNameToClassInfoMapping = Maps.newHashMap();
 
     JarDebugClient(InstrumentInfo instrumentInfo) {
         this.instrumentInfo = instrumentInfo;
         logger.info("start init jar debugg client");
         try {
-            class_classInfo = initAllClassInfo(instrumentInfo, true);
+            classNameToClassInfoMapping = initAllClassInfo(instrumentInfo, true);
             logger.info("success init jar decompiler client");
         } catch (Exception e) {
             destroy();
@@ -74,14 +74,14 @@ private Map<String, ClassInfo> initAllClassInfo(InstrumentInfo instrumentInfo, b
         if (isLoadAll) {
             classInfoMap = Maps.newHashMap();
         } else {
-            classInfoMap = Maps.newHashMap(class_classInfo);
+            classInfoMap = Maps.newHashMap(classNameToClassInfoMapping);
         }
         Map<String, JarFile> jarFileMap = new HashMap<>();
         Map<String, Optional<Properties>> mavenInfoMap = new HashMap<>();
         try {
             for (Class clazz : loadedClasses) {
                 final String clazzName = clazz.getName();
-                if (Strings.isNullOrEmpty(clazzName) || clazzName.startsWith("[") || clazzName.indexOf("$") >= 0) {
+                if (Strings.isNullOrEmpty(clazzName) || clazzName.startsWith("[") || clazzName.contains("$")) {
                     continue;
                 }
 
@@ -111,7 +111,7 @@ private Map<String, ClassInfo> initAllClassInfo(InstrumentInfo instrumentInfo, b
     }
 
     public Set<String> getAllClass() {
-        return ImmutableSet.copyOf(class_classInfo.keySet());
+        return ImmutableSet.copyOf(classNameToClassInfoMapping.keySet());
     }
 
     /**
@@ -121,8 +121,7 @@ public Set<String> getAllClass() {
      */
     public boolean reloadAllClass() {
         logger.info("begin reload all class");
-        Map<String, ClassInfo> tmpClassInfo = initAllClassInfo(instrumentInfo, true);
-        class_classInfo = tmpClassInfo;
+        classNameToClassInfoMapping = initAllClassInfo(instrumentInfo, true);
         logger.info("end reload all class");
         return true;
     }
@@ -134,15 +133,14 @@ public boolean reloadAllClass() {
      */
     public boolean reLoadNewClass() {
         logger.info("begin reload new class");
-        Map<String, ClassInfo> tmpClassInfo = initAllClassInfo(instrumentInfo, false);
-        class_classInfo = tmpClassInfo;
+        classNameToClassInfoMapping = initAllClassInfo(instrumentInfo, false);
         logger.info("end reload new class");
         return true;
     }
 
 
     public ClassInfo getClassPath(final String className) {
-        return class_classInfo.get(className);
+        return classNameToClassInfoMapping.get(className);
     }
 
     private ClassInfo getClassInfo(Class clazz, Map<String, JarFile> jarFileMap, Map<String, Optional<Properties>> mavenInfoMap) {

diff --git a/...rthas/src/main/java/qunar/tc/bistoury/attach/arthas/instrument/InstrumentClientStore.java b/...rthas/src/main/java/qunar/tc/bistoury/attach/arthas/instrument/InstrumentClientStore.java
@@ -113,12 +113,16 @@ public Class<?> get() {
     }
 
     public static synchronized void destroy() {
-        if (instrumentInfo != null) {
-            instrumentInfo.reset();
+        try {
+            if (instrumentInfo != null) {
+                instrumentInfo.reset();
 
-            for (InstrumentClient client : clients) {
-                client.destroy();
+                for (InstrumentClient client : clients) {
+                    client.destroy();
+                }
             }
+        } catch (Exception e) {
+            logger.error("", "destroy error", e);
         }
     }
 }
diff --git a/...attach-arthas/src/main/java/qunar/tc/bistoury/attach/arthas/server/BistouryBootstrap.java b/...attach-arthas/src/main/java/qunar/tc/bistoury/attach/arthas/server/BistouryBootstrap.java
@@ -124,6 +124,10 @@ public void bind(Configure configure) throws Throwable {
             if (shellServer != null) {
                 shellServer.close();
             }
+
+            InstrumentClientStore.destroy();
+
+            isBindRef.compareAndSet(true, false);
             throw e;
         }
     }

diff --git a/...-attach-arthas/src/main/java/qunar/tc/bistoury/attach/arthas/server/QShutdownCommand.java b/...-attach-arthas/src/main/java/qunar/tc/bistoury/attach/arthas/server/QShutdownCommand.java
@@ -48,11 +48,7 @@ public void process(CommandProcess process) {
                 // ignore
             }
 
-            try {
-                InstrumentClientStore.destroy();
-            } catch (Exception e) {
-                // ignore
-            }
+            InstrumentClientStore.destroy();
 
             process.write("bistoury Server is going to shut down...\n");
         } finally {

diff --git a/bistoury-attach-common/pom.xml b/bistoury-attach-common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>bistoury</artifactId>
         <groupId>qunar.tc.bistoury</groupId>
-        <version>2.0.5</version>
+        <version>2.0.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/bistoury-clientside-common/pom.xml b/bistoury-clientside-common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>bistoury</artifactId>
         <groupId>qunar.tc.bistoury</groupId>
-        <version>2.0.5</version>
+        <version>2.0.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/bistoury-commands/pom.xml b/bistoury-commands/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>bistoury</artifactId>
         <groupId>qunar.tc.bistoury</groupId>
-        <version>2.0.5</version>
+        <version>2.0.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/bistoury-common/pom.xml b/bistoury-common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>bistoury</artifactId>
         <groupId>qunar.tc.bistoury</groupId>
-        <version>2.0.5</version>
+        <version>2.0.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/bistoury-common/src/main/java/qunar/tc/bistoury/common/AsyncHttpClientHolder.java b/bistoury-common/src/main/java/qunar/tc/bistoury/common/AsyncHttpClientHolder.java
@@ -38,8 +38,8 @@ public class AsyncHttpClientHolder {
 
     private static final AsyncHttpClient INSTANCE = initClient();
 
-    private static final int CONN_TIMEOUT = 1000;
-    private static final int REQUEST_TIMEOUT = 2000;
+    private static final int CONN_TIMEOUT = 2000;
+    private static final int REQUEST_TIMEOUT = 3000;
     private static final int READ_TIMEOUT = Integer.MAX_VALUE;
 
     private static final int BOSS_COUNT = 1;

diff --git a/bistoury-common/src/main/java/qunar/tc/bistoury/common/BistouryConstants.java b/bistoury-common/src/main/java/qunar/tc/bistoury/common/BistouryConstants.java
@@ -56,7 +56,7 @@ public class BistouryConstants {
     public static final String SPY_CLASSNAME = "qunar.tc.bistoury.instrument.spy.BistourySpys1";
 
     // todo: 先这么写吧
-    public static final String CURRENT_VERSION = "2.0.5";
+    public static final String CURRENT_VERSION = "2.0.6";
 
     public static final String BISTOURY_VERSION_LINE_PREFIX = "bistoury version:";
 

diff --git a/bistoury-common/src/main/java/qunar/tc/bistoury/common/FileUtil.java b/bistoury-common/src/main/java/qunar/tc/bistoury/common/FileUtil.java
@@ -19,6 +19,7 @@
 
 import com.google.common.base.Charsets;
 import com.google.common.base.Predicate;
+import com.google.common.base.Predicates;
 import com.google.common.collect.Lists;
 import com.google.common.io.Files;
 
@@ -59,31 +60,25 @@ public static List<File> listFile(File file, Predicate<File> filter) {
         return result;
     }
 
-    private static void listFile(List<String> result, File file) {
-        if (file.isDirectory()) {
-            File[] files = file.listFiles();
-            if (files == null)
-                return;
-
-            for (File f : files) {
-                listFile(result, f);
-            }
-        } else {
-            result.add(file.getName());
+    private static void listFile(List<String> resultNames, File file) {
+        List<File> resultFiles = Lists.newArrayList();
+        listFile(resultFiles, file, Predicates.<File>alwaysTrue());
+        for (File resultFile : resultFiles) {
+            resultNames.add(resultFile.getName());
         }
     }
 
-    private static void listFile(List<File> result, File file, Predicate<File> filter) {
+    private static void listFile(List<File> resultFiles, File file, Predicate<File> filter) {
         if (file.isDirectory()) {
             File[] files = file.listFiles();
             if (files == null) {
                 return;
             }
             for (File f : files) {
-                listFile(result, f, filter);
+                listFile(resultFiles, f, filter);
             }
         } else if (filter.apply(file)) {
-            result.add(file);
+            resultFiles.add(file);
         }
     }
 

diff --git a/bistoury-decompiler-fernflower/pom.xml b/bistoury-decompiler-fernflower/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>bistoury</artifactId>
         <groupId>qunar.tc.bistoury</groupId>
-        <version>2.0.5</version>
+        <version>2.0.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/bistoury-dist/pom.xml b/bistoury-dist/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>bistoury</artifactId>
         <groupId>qunar.tc.bistoury</groupId>
-        <version>2.0.5</version>
+        <version>2.0.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/bistoury-independent-agent/pom.xml b/bistoury-independent-agent/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>bistoury</artifactId>
         <groupId>qunar.tc.bistoury</groupId>
-        <version>2.0.5</version>
+        <version>2.0.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/bistoury-instrument-agent/pom.xml b/bistoury-instrument-agent/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>bistoury</artifactId>
         <groupId>qunar.tc.bistoury</groupId>
-        <version>2.0.5</version>
+        <version>2.0.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/...ry-instrument-agent/src/main/java/qunar/tc/bistoury/instrument/agent/AgentBootstrap2.java b/...ry-instrument-agent/src/main/java/qunar/tc/bistoury/instrument/agent/AgentBootstrap2.java
@@ -325,6 +325,6 @@ private static void bind(Instrumentation inst, ClassLoader agentLoader, String a
                 throw e;
             }
         }
-        ps.println("Arthas server already bind.");
+        ps.println("Bistoury server already bind.");
     }
 }
diff --git a/bistoury-instrument-client/pom.xml b/bistoury-instrument-client/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>bistoury</artifactId>
         <groupId>qunar.tc.bistoury</groupId>
-        <version>2.0.5</version>
+        <version>2.0.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/bistoury-instrument-spy/pom.xml b/bistoury-instrument-spy/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>bistoury</artifactId>
         <groupId>qunar.tc.bistoury</groupId>
-        <version>2.0.5</version>
+        <version>2.0.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/bistoury-magic-classes/pom.xml b/bistoury-magic-classes/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>bistoury</artifactId>
         <groupId>qunar.tc.bistoury</groupId>
-        <version>2.0.5</version>
+        <version>2.0.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>