新增:执行队列监控,监控到队列任务执行超过5秒,抛出日志提醒,并创建新的执行线程继续后续任务
This commit is contained in:
parent
2ef7ce67cc
commit
8316fce151
@ -16,10 +16,7 @@ import java.util.HashMap;
|
|||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.concurrent.CompletableFuture;
|
import java.util.concurrent.*;
|
||||||
import java.util.concurrent.ConcurrentHashMap;
|
|
||||||
import java.util.concurrent.LinkedBlockingQueue;
|
|
||||||
import java.util.function.BiConsumer;
|
|
||||||
import java.util.function.Consumer;
|
import java.util.function.Consumer;
|
||||||
import java.util.function.Function;
|
import java.util.function.Function;
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
@ -44,11 +41,11 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer
|
|||||||
private final LinkedBlockingQueue<Event<String>> rpcCallQueue = new LinkedBlockingQueue<>(); // RPC CALL MSG
|
private final LinkedBlockingQueue<Event<String>> rpcCallQueue = new LinkedBlockingQueue<>(); // RPC CALL MSG
|
||||||
private final LinkedBlockingQueue<String> sendMsgQueue = new LinkedBlockingQueue<>(); // SEND MSG
|
private final LinkedBlockingQueue<String> sendMsgQueue = new LinkedBlockingQueue<>(); // SEND MSG
|
||||||
|
|
||||||
private BiConsumer<Runnable, Integer> threadBuilder = (r, n) -> {
|
/*private BiConsumer<Runnable, Integer> threadBuilder = (r, n) -> {
|
||||||
for (int i = 0; i < n; i++) {
|
for (int i = 0; i < n; i++) {
|
||||||
new Thread(() -> r.run()).start();
|
new Thread(() -> r.run()).start();
|
||||||
}
|
}
|
||||||
};
|
};*/
|
||||||
|
|
||||||
/*private static boolean isFirst = true;
|
/*private static boolean isFirst = true;
|
||||||
private boolean isMain = false;*/
|
private boolean isMain = false;*/
|
||||||
@ -182,8 +179,9 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer
|
|||||||
}
|
}
|
||||||
}).start();
|
}).start();
|
||||||
|
|
||||||
// 定时调度事件
|
// 定时调度事件,已加入耗时监控
|
||||||
threadBuilder.accept(() -> {
|
new Thread(() -> {
|
||||||
|
ExecutorService pool = Executors.newFixedThreadPool(1);
|
||||||
while (true) {
|
while (true) {
|
||||||
Timer timer = null;
|
Timer timer = null;
|
||||||
try {
|
try {
|
||||||
@ -191,36 +189,46 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
long start = System.currentTimeMillis();
|
long start = System.currentTimeMillis();
|
||||||
timer.runnable.run();
|
pool.submit(timer.runnable).get(5, TimeUnit.SECONDS);
|
||||||
long end = System.currentTimeMillis();
|
long end = System.currentTimeMillis();
|
||||||
logger.finest(String.format("timer [%s] : elapsed time %s ms", timer.name, end - start));
|
logger.finest(String.format("timer [%s] : elapsed time %s ms", timer.name, end - start));
|
||||||
} catch (InterruptedException e) {
|
} catch (InterruptedException e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
|
} catch (TimeoutException e) {
|
||||||
|
logger.log(Level.SEVERE, "timer [" + timer.name + "] time out: " + 5 + " S", e);
|
||||||
|
pool = Executors.newFixedThreadPool(1);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
logger.log(Level.WARNING, "timer [" + timer.name + "]", e);
|
logger.log(Level.WARNING, "timer [" + timer.name + "]", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}, 1);
|
}).start();
|
||||||
|
|
||||||
// topic msg
|
// topic msg,已加入耗时监控
|
||||||
threadBuilder.accept(() -> {
|
new Thread(() -> {
|
||||||
|
ExecutorService pool = Executors.newFixedThreadPool(1);
|
||||||
while (true) {
|
while (true) {
|
||||||
Event<String> event = null;
|
Event<String> event = null;
|
||||||
try {
|
try {
|
||||||
if ((event = topicQueue.take()) == null) {
|
if ((event = topicQueue.take()) == null) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
accept(event.topic, event.value);
|
|
||||||
|
String topic = event.topic;
|
||||||
|
String value = event.value;
|
||||||
|
pool.submit(() -> accept(topic, value)).get(5, TimeUnit.SECONDS);
|
||||||
} catch (InterruptedException e) {
|
} catch (InterruptedException e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
|
} catch (TimeoutException e) {
|
||||||
|
logger.log(Level.SEVERE, "topic[" + event.topic + "] event deal time out: " + 5 + " S, value: " + event.value, e);
|
||||||
|
pool = Executors.newFixedThreadPool(1);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
logger.log(Level.WARNING, "topic[" + event.topic + "] event accept error :" + event.value, e);
|
logger.log(Level.WARNING, "topic[" + event.topic + "] event accept error :" + event.value, e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}, 16);
|
}).start();
|
||||||
|
|
||||||
// rpc back
|
// rpc back ,仅做数据解析,暂无耗时监控
|
||||||
threadBuilder.accept(() -> {
|
new Thread(() -> {
|
||||||
while (true) {
|
while (true) {
|
||||||
Event<String> event = null;
|
Event<String> event = null;
|
||||||
try {
|
try {
|
||||||
@ -236,10 +244,11 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer
|
|||||||
logger.log(Level.WARNING, "rpc-back[" + event.topic + "] event accept error :" + event.value, e);
|
logger.log(Level.WARNING, "rpc-back[" + event.topic + "] event accept error :" + event.value, e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}, 1);
|
}).start();
|
||||||
|
|
||||||
// rpc call
|
// rpc call,已加入耗时监控
|
||||||
threadBuilder.accept(() -> {
|
new Thread(() -> {
|
||||||
|
ExecutorService pool = Executors.newFixedThreadPool(1);
|
||||||
while (true) {
|
while (true) {
|
||||||
Event<String> event = null;
|
Event<String> event = null;
|
||||||
try {
|
try {
|
||||||
@ -247,17 +256,22 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
logger.finest(String.format("rpc-call:[%s] %s", event.topic, event.value));
|
logger.finest(String.format("rpc-call:[%s] %s", event.topic, event.value));
|
||||||
accept(event.topic, event.value);
|
String topic = event.topic;
|
||||||
|
String value = event.value;
|
||||||
|
pool.submit(() -> accept(topic, value)).get(5, TimeUnit.SECONDS);
|
||||||
} catch (InterruptedException e) {
|
} catch (InterruptedException e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
|
} catch (TimeoutException e) {
|
||||||
|
logger.log(Level.SEVERE, "topic[" + event.topic + "] event deal time out: " + 5 + " S, value: " + event.value, e);
|
||||||
|
pool = Executors.newFixedThreadPool(1);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
logger.log(Level.WARNING, "rpc-call[" + event.topic + "] event accept error :" + event.value, e);
|
logger.log(Level.WARNING, "rpc-call[" + event.topic + "] event accept error :" + event.value, e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}, 1);
|
}).start();
|
||||||
|
|
||||||
// send msg
|
// send msg
|
||||||
threadBuilder.accept(() -> {
|
new Thread(() -> {
|
||||||
while (true) {
|
while (true) {
|
||||||
String msg = null;
|
String msg = null;
|
||||||
try {
|
try {
|
||||||
@ -273,7 +287,7 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer
|
|||||||
logger.log(Level.WARNING, "send-msg[" + msg + "] event accept error :", e);
|
logger.log(Level.WARNING, "send-msg[" + msg + "] event accept error :", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}, 1);
|
}).start();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user