将所有的线程改为守护线程

rexren · Aug 17, 2016 · b39f00a · b39f00a
1 parent 4679e26
commit b39f00a
Show file tree

Hide file tree

Showing 12 changed files with 73 additions and 58 deletions.
diff --git a/skywalking-alarm/src/main/java/com/a/eye/skywalking/alarm/AlarmMessageProcessThread.java b/skywalking-alarm/src/main/java/com/a/eye/skywalking/alarm/AlarmMessageProcessThread.java
@@ -37,6 +37,7 @@ public class AlarmMessageProcessThread extends Thread {
     public AlarmMessageProcessThread() {
         // 初始化生成ThreadId
         threadId = UUID.randomUUID().toString();
+        this.setDaemon(true);
     }
 
     @Override

diff --git a/skywalking-alarm/src/main/java/com/a/eye/skywalking/alarm/UserInfoCoordinator.java b/skywalking-alarm/src/main/java/com/a/eye/skywalking/alarm/UserInfoCoordinator.java
@@ -31,6 +31,7 @@ public class UserInfoCoordinator extends Thread {
     private boolean isCoordinator = false;
 
     public UserInfoCoordinator() {
+        this.setDaemon(true);
     }
 
     @Override

diff --git a/skywalking-alarm/src/main/java/com/a/eye/skywalking/alarm/UsersChangedDetectionThread.java b/skywalking-alarm/src/main/java/com/a/eye/skywalking/alarm/UsersChangedDetectionThread.java
@@ -19,6 +19,10 @@ public class UsersChangedDetectionThread extends Thread {
     private String userIdsEncryptedStr;
     private Logger logger = LogManager.getLogger(UsersChangedDetectionThread.class);
 
+    public UsersChangedDetectionThread() {
+        this.setDaemon(true);
+    }
+
     public void run() {
         while (true) {
             try {

diff --git a/...lking-collector/skywalking-api/src/main/java/com/a/eye/skywalking/buffer/BufferGroup.java b/...lking-collector/skywalking-api/src/main/java/com/a/eye/skywalking/buffer/BufferGroup.java
@@ -61,6 +61,7 @@ private ConsumerWorker(int start, int end) {
             super("ConsumerWorker");
             this.start = start;
             this.end = end;
+            this.setDaemon(true);
         }
 
         @Override

diff --git a/...skywalking-api/src/main/java/com/a/eye/skywalking/selfexamination/SDKHealthCollector.java b/...skywalking-api/src/main/java/com/a/eye/skywalking/selfexamination/SDKHealthCollector.java
@@ -18,6 +18,7 @@ public class SDKHealthCollector extends Thread {
 
 	private SDKHealthCollector() {
 		super("HealthCollector");
+		this.setDaemon(true);
 	}
 
 	public static void init() {

diff --git a/...kywalking-api/src/main/java/com/a/eye/skywalking/sender/DataSenderFactoryWithBalance.java b/...kywalking-api/src/main/java/com/a/eye/skywalking/sender/DataSenderFactoryWithBalance.java
@@ -102,6 +102,7 @@ public static IDataSender getSender() {
     public static class DataSenderChecker extends Thread {
         public DataSenderChecker() {
             super("Data-Sender-Checker");
+            this.setDaemon(true);
         }
 
         @Override

diff --git a/...alking-server/src/main/java/com/a/eye/skywalking/reciever/buffer/AppendEOFFlagThread.java b/...alking-server/src/main/java/com/a/eye/skywalking/reciever/buffer/AppendEOFFlagThread.java
@@ -19,6 +19,7 @@ public AppendEOFFlagThread(File[] dataBufferFiles, CountDownLatch countDownLatch
         super("AppendEOFFlagThread");
         this.dataBufferFiles = dataBufferFiles;
         this.countDownLatch = countDownLatch;
+        this.setDaemon(true);
     }
 
     @Override

diff --git a/skywalking-server/src/main/java/com/a/eye/skywalking/reciever/buffer/DataBufferThread.java b/skywalking-server/src/main/java/com/a/eye/skywalking/reciever/buffer/DataBufferThread.java
@@ -26,6 +26,7 @@ public class DataBufferThread extends Thread {
 
     public DataBufferThread(int threadIdx) {
         super("DataBufferThread_" + threadIdx);
+        this.setDaemon(true);
     }
 
     @Override

diff --git a/...ing-server/src/main/java/com/a/eye/skywalking/reciever/peresistent/PersistenceThread.java b/...ing-server/src/main/java/com/a/eye/skywalking/reciever/peresistent/PersistenceThread.java
@@ -24,6 +24,7 @@ public class    PersistenceThread extends Thread {
 
     public PersistenceThread(int trdIndex) {
         super("PersistentThread" + trdIndex);
+        this.setDaemon(true);
     }
 
     @Override

diff --git a/...er/src/main/java/com/a/eye/skywalking/reciever/peresistent/RegisterPersistenceThread.java b/...er/src/main/java/com/a/eye/skywalking/reciever/peresistent/RegisterPersistenceThread.java
@@ -30,6 +30,7 @@ public RegisterPersistenceThread() {
                 Config.RegisterPersistence.REGISTER_FILE_PARENT_DIRECTORY, Config.RegisterPersistence.REGISTER_FILE_NAME);
         bakOffsetFile = new File(
                 Config.RegisterPersistence.REGISTER_FILE_PARENT_DIRECTORY, Config.RegisterPersistence.REGISTER_BAK_FILE_NAME);
+        this.setDaemon(true);
     }
 
     @Override

diff --git a/.../main/java/com/a/eye/skywalking/reciever/processor/ackspan/alarm/AlarmRedisConnector.java b/.../main/java/com/a/eye/skywalking/reciever/processor/ackspan/alarm/AlarmRedisConnector.java
@@ -57,6 +57,7 @@ public RedisInspector() {
                     Config.Alarm.ALARM_OFF_FLAG = true;
                 }
             }
+            this.setDaemon(true);
         }
 
         private RedisInspector connect() {

diff --git a/...er/src/main/java/com/a/eye/skywalking/reciever/selfexamination/ServerHealthCollector.java b/...er/src/main/java/com/a/eye/skywalking/reciever/selfexamination/ServerHealthCollector.java
@@ -10,66 +10,67 @@
 import org.apache.logging.log4j.Logger;
 
 public class ServerHealthCollector extends Thread {
-	private Logger logger = LogManager.getLogger(ServerHealthCollector.class);
+    private Logger logger = LogManager.getLogger(ServerHealthCollector.class);
 
-	private static Map<String, ServerHeathReading> heathReadings = new ConcurrentHashMap<String, ServerHeathReading>();
+    private static Map<String, ServerHeathReading> heathReadings = new ConcurrentHashMap<String, ServerHeathReading>();
 
-	private ServerHealthCollector(){
-		super("ServerHealthCollector");
-	}
-
-	public static void init(){
-		new ServerHealthCollector().start();
-	}
-
-	public static ServerHeathReading getCurrentHeathReading(String extraId) {
-		String id = getId(extraId);
-		if (!heathReadings.containsKey(id)) {
-			synchronized (heathReadings) {
-				if (!heathReadings.containsKey(id)) {
-					if(heathReadings.keySet().size() > 5000){
-						throw new RuntimeException("use ServerHealthCollector illegal. There is an overflow trend of Server Health Collector Report Data.");
-					}
-					heathReadings.put(id, new ServerHeathReading(id));
-				}
-			}
-		}
-		return heathReadings.get(id);
-	}
+    private ServerHealthCollector() {
+        super("ServerHealthCollector");
+        this.setDaemon(true);
+    }
 
-	private static String getId(String extraId) {
-		return "SkyWalkingServer,M:" + MachineUtil.getHostDesc() + ",P:"
-				+ MachineUtil.getProcessNo() + ",T:"
-				+ Thread.currentThread().getName() + "("
-				+ Thread.currentThread().getId() + ")"
-				+ (extraId == null ? "" : ",extra:" + extraId);
-	}
+    public static void init() {
+        new ServerHealthCollector().start();
+    }
 
-	@Override
-	public void run() {
-		while (true) {
-			try {
-				Map<String, ServerHeathReading> heathReadingsSnapshot = heathReadings;
-				heathReadings = new ConcurrentHashMap<String, ServerHeathReading>();
-				String[] keyList = heathReadingsSnapshot.keySet().toArray(new String[0]);
-				Arrays.sort(keyList);
-				StringBuilder log = new StringBuilder();
-				log.append("\n---------Server Health Collector Report---------\n");
-				for(String key : keyList){
-					log.append(heathReadingsSnapshot.get(key)).append("\n");
-				}
-				log.append("------------------------------------------------\n");
-
-				logger.info(log);
-
-				try {
-					Thread.sleep(Config.HealthCollector.REPORT_INTERVAL);
-				} catch (InterruptedException e) {
-					logger.warn("sleep error.", e);
-				}
-			} catch (Throwable t) {
-				logger.error("ServerHealthCollector report error.", t);
-			}
-		}
-	}
+    public static ServerHeathReading getCurrentHeathReading(String extraId) {
+        String id = getId(extraId);
+        if (!heathReadings.containsKey(id)) {
+            synchronized (heathReadings) {
+                if (!heathReadings.containsKey(id)) {
+                    if (heathReadings.keySet().size() > 5000) {
+                        throw new RuntimeException(
+                                "use ServerHealthCollector illegal. There is an overflow trend of Server Health Collector Report Data.");
+                    }
+                    heathReadings.put(id, new ServerHeathReading(id));
+                }
+            }
+        }
+        return heathReadings.get(id);
+    }
+
+    private static String getId(String extraId) {
+        return "SkyWalkingServer,M:" + MachineUtil.getHostDesc() + ",P:" + MachineUtil.getProcessNo() + ",T:" + Thread
+                .currentThread().getName() + "(" + Thread.currentThread().getId() + ")" + (extraId == null ?
+                "" :
+                ",extra:" + extraId);
+    }
+
+    @Override
+    public void run() {
+        while (true) {
+            try {
+                Map<String, ServerHeathReading> heathReadingsSnapshot = heathReadings;
+                heathReadings = new ConcurrentHashMap<String, ServerHeathReading>();
+                String[] keyList = heathReadingsSnapshot.keySet().toArray(new String[0]);
+                Arrays.sort(keyList);
+                StringBuilder log = new StringBuilder();
+                log.append("\n---------Server Health Collector Report---------\n");
+                for (String key : keyList) {
+                    log.append(heathReadingsSnapshot.get(key)).append("\n");
+                }
+                log.append("------------------------------------------------\n");
+
+                logger.info(log);
+
+                try {
+                    Thread.sleep(Config.HealthCollector.REPORT_INTERVAL);
+                } catch (InterruptedException e) {
+                    logger.warn("sleep error.", e);
+                }
+            } catch (Throwable t) {
+                logger.error("ServerHealthCollector report error.", t);
+            }
+        }
+    }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -57,6 +57,7 @@ public RedisInspector() { @@
                         Config.Alarm.ALARM_OFF_FLAG = true;
                     }
                 }
+                this.setDaemon(true);
             }
             private RedisInspector connect() {
@@ Expand Down @@