diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2018-03-02 11:56:57 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-02 11:56:57 +0100 |
commit | 64a8801dad13cae3158cd021ab2c1402805c24ad (patch) | |
tree | e80c9b3120cd5df34ff3348b4c64745704870887 | |
parent | f0e1232e5606a81b632700cc1a1b7da06b3ba463 (diff) | |
parent | de6d1f03e194a0e053e3dd1c576679d29fce73ac (diff) |
Merge pull request #5194 from vespa-engine/balder/provide-reason-before-dumping-threads
1 - If another thread is already in progress dumping threads just makā¦
-rw-r--r-- | vespajlib/src/main/java/com/yahoo/protect/Process.java | 65 |
1 files changed, 40 insertions, 25 deletions
diff --git a/vespajlib/src/main/java/com/yahoo/protect/Process.java b/vespajlib/src/main/java/com/yahoo/protect/Process.java index 67da6a1cdd8..a4396f13fd3 100644 --- a/vespajlib/src/main/java/com/yahoo/protect/Process.java +++ b/vespajlib/src/main/java/com/yahoo/protect/Process.java @@ -3,6 +3,7 @@ package com.yahoo.protect; import java.util.Map; +import java.util.concurrent.atomic.AtomicBoolean; import java.util.logging.Level; import java.util.logging.Logger; @@ -14,6 +15,9 @@ import java.util.logging.Logger; */ public final class Process { + private static final AtomicBoolean alreadyShuttingDown = new AtomicBoolean(false); + private static final AtomicBoolean busyDumpingThreads = new AtomicBoolean(false); + private static final Logger log = Logger.getLogger(Process.class.getName()); /** Die with a message, without dumping thread state */ @@ -41,44 +45,55 @@ public final class Process { * log with level info before shutting down */ public static void logAndDie(String message, Throwable thrown, boolean dumpThreads) { + boolean shutDownInProgress = alreadyShuttingDown.getAndSet(true); try { + if (thrown != null) { + log.log(Level.SEVERE, message, thrown); + } else { + log.log(Level.SEVERE, message); + } + log.log(Level.INFO, "About to shut down."); if (dumpThreads) { - log.log(Level.INFO, "About to shut down."); dumpThreads(); } - if (thrown != null) - log.log(Level.SEVERE, message, thrown); - else - log.log(Level.SEVERE, message); } finally { - try { - Runtime.getRuntime().halt(1); - } - catch (Throwable t) { - log.log(Level.SEVERE, "Runtime.halt rejected. Throwing an error."); - throw new ShutdownError("Shutdown requested, but failed to shut down"); + if ( ! shutDownInProgress ) { + try { + Runtime.getRuntime().halt(1); + } catch (Throwable t) { + log.log(Level.SEVERE, "Runtime.halt rejected. Throwing an error."); + throw new ShutdownError("Shutdown requested, but failed to shut down"); + } + } else { + log.log(Level.WARNING, "Shutdown already in progress. Will just let death come upon us normally."); } } } public static void dumpThreads() { - try { - log.log(Level.INFO, "Commencing full thread dump for diagnosis."); - Map<Thread, StackTraceElement[]> allStackTraces = Thread.getAllStackTraces(); - for (Map.Entry<Thread, StackTraceElement[]> e : allStackTraces.entrySet()) { - Thread t = e.getKey(); - StackTraceElement[] stack = e.getValue(); - StringBuilder forOneThread = new StringBuilder(); - forOneThread.append("Stack for thread: ").append(t.getName()).append(": "); - for (StackTraceElement s : stack) { - forOneThread.append('\n').append(s.toString()); + boolean alreadyDumpingThreads = busyDumpingThreads.getAndSet(true); + if ( ! alreadyDumpingThreads ) { + try { + log.log(Level.INFO, "Commencing full thread dump for diagnosis."); + Map<Thread, StackTraceElement[]> allStackTraces = Thread.getAllStackTraces(); + for (Map.Entry<Thread, StackTraceElement[]> e : allStackTraces.entrySet()) { + Thread t = e.getKey(); + StackTraceElement[] stack = e.getValue(); + StringBuilder forOneThread = new StringBuilder(); + forOneThread.append("Stack for thread: ").append(t.getName()).append(": "); + for (StackTraceElement s : stack) { + forOneThread.append('\n').append(s.toString()); + } + log.log(Level.INFO, forOneThread.toString()); } - log.log(Level.INFO, forOneThread.toString()); + log.log(Level.INFO, "End of diagnostic thread dump."); + } catch (Exception e) { + // just give up... } - log.log(Level.INFO, "End of diagnostic thread dump."); - } catch (Exception e) { - // just give up... + busyDumpingThreads.set(false); + } else { + log.log(Level.WARNING, "Thread dump already in progress. Skipping it."); } } |