AGentooCat/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add deadlocks to event log

Browse Source
This commit is contained in:
zzz
2022-08-23 13:01:32 -04:00
parent d064de1913
commit 6ddaa72a86
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
apps/routerconsole/java/src/net/i2p/router/web/DeadlockDetector.java
View File

@@ -4,7 +4,8 @@ import java.lang.management.ManagementFactory;
import java.lang.management.ThreadInfo;
import java.lang.management.ThreadMXBean;
import net.i2p.I2PAppContext;
import net.i2p.router.RouterContext;
import net.i2p.router.util.EventLog;
import net.i2p.util.Log;
import net.i2p.util.SimpleTimer2;
@@ -19,12 +20,12 @@ import net.i2p.util.SimpleTimer2;
*/
class DeadlockDetector extends SimpleTimer2.TimedEvent {
private final I2PAppContext _context;
private final RouterContext _context;
private final Log _log;
private static final String PROP_INTERVAL = "router.deadlockDetectIntervalHours";
private static final long DEFAULT_INTERVAL = 24;
public DeadlockDetector(I2PAppContext ctx) {
public DeadlockDetector(RouterContext ctx) {
super(ctx.simpleTimer2());
_context = ctx;
_log = _context.logManager().getLog(DeadlockDetector.class);
@@ -41,6 +42,7 @@ class DeadlockDetector extends SimpleTimer2.TimedEvent {
public void timeReached() {
long start = System.currentTimeMillis();
boolean detected = detect();
// only reschedule if not detected
if (!detected) {
long time = System.currentTimeMillis() - start;
if (_log.shouldDebug())
@@ -55,7 +57,7 @@ class DeadlockDetector extends SimpleTimer2.TimedEvent {
return detect(_context);
}
public static boolean detect(I2PAppContext ctx) {
public static boolean detect(RouterContext ctx) {
try {
ThreadMXBean mxb = ManagementFactory.getThreadMXBean();
long[] ids = mxb.findDeadlockedThreads();
@@ -89,6 +91,7 @@ class DeadlockDetector extends SimpleTimer2.TimedEvent {
buf.append("\nAfter reporting, please restart your router!\n");
Log log = ctx.logManager().getLog(DeadlockDetector.class);
log.log(Log.CRIT, buf.toString());
ctx.router().eventLog().addEvent(EventLog.DEADLOCK, infos.length + " threads");
} catch (Throwable t) {
// class not found, unsupportedoperation, ...
Log log = ctx.logManager().getLog(DeadlockDetector.class);

1
apps/routerconsole/java/src/net/i2p/router/web/helpers/EventLogHelper.java
View File

@@ -36,6 +36,7 @@ public class EventLogHelper extends FormHandler {
EventLog.CLOCK_SHIFT, _x("Clock shifted"),
EventLog.CRASHED, _x("Crashed"),
EventLog.CRITICAL, _x("Critical error"),
EventLog.DEADLOCK, _x("Deadlock detected"),
EventLog.INSTALLED, _x("Installed new version"),
EventLog.INSTALL_FAILED, _x("Install failed"),
EventLog.NETWORK, _x("Network error"),

1
router/java/src/net/i2p/router/util/EventLog.java
View File

@@ -40,6 +40,7 @@ public class EventLog {
public static final String CLOCK_SHIFT = "clockShift";
public static final String CRASHED = "crashed";
public static final String CRITICAL = "critical";
public static final String DEADLOCK = "deadlock";
public static final String INSTALLED = "installed";
public static final String INSTALL_FAILED = "installFailed";
public static final String NETWORK = "network";