You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@samza.apache.org by pm...@apache.org on 2018/03/31 00:11:53 UTC
samza git commit: SAMZA-1630: Move thread dump from stdout to logs
Repository: samza
Updated Branches:
refs/heads/master e58e3cadc -> aba739307
SAMZA-1630: Move thread dump from stdout to logs
Author: Prateek Maheshwari <pm...@linkedin.com>
Reviewers: Jagadish Venkatraman <jv...@linkedin.com>
Closes #462 from prateekm/thread-dump-on-timeout
Project: http://git-wip-us.apache.org/repos/asf/samza/repo
Commit: http://git-wip-us.apache.org/repos/asf/samza/commit/aba73930
Tree: http://git-wip-us.apache.org/repos/asf/samza/tree/aba73930
Diff: http://git-wip-us.apache.org/repos/asf/samza/diff/aba73930
Branch: refs/heads/master
Commit: aba739307174db49adf5f833c5b32c8bfb623153
Parents: e58e3ca
Author: Prateek Maheshwari <pm...@linkedin.com>
Authored: Fri Mar 30 17:11:49 2018 -0700
Committer: Prateek Maheshwari <pm...@linkedin.com>
Committed: Fri Mar 30 17:11:49 2018 -0700
----------------------------------------------------------------------
.../org/apache/samza/container/ContainerHeartbeatMonitor.java | 2 +-
.../apache/samza/container/SamzaContainerExceptionHandler.java | 2 +-
.../main/java/org/apache/samza/task/TaskCallbackManager.java | 2 +-
.../main/scala/org/apache/samza/container/SamzaContainer.scala | 2 +-
samza-core/src/main/scala/org/apache/samza/util/Util.scala | 6 +++---
5 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/samza/blob/aba73930/samza-core/src/main/java/org/apache/samza/container/ContainerHeartbeatMonitor.java
----------------------------------------------------------------------
diff --git a/samza-core/src/main/java/org/apache/samza/container/ContainerHeartbeatMonitor.java b/samza-core/src/main/java/org/apache/samza/container/ContainerHeartbeatMonitor.java
index ba21141..09f68f2 100644
--- a/samza-core/src/main/java/org/apache/samza/container/ContainerHeartbeatMonitor.java
+++ b/samza-core/src/main/java/org/apache/samza/container/ContainerHeartbeatMonitor.java
@@ -57,7 +57,7 @@ public class ContainerHeartbeatMonitor {
scheduler.schedule(() -> {
// On timeout of container shutting down, force exit.
LOG.error("Graceful shutdown timeout expired. Force exiting.");
- Util.printThreadDump("Thread dump at heartbeat monitor shutdown timeout.");
+ Util.logThreadDump("Thread dump at heartbeat monitor shutdown timeout.");
System.exit(1);
}, SHUTDOWN_TIMOUT_MS, TimeUnit.MILLISECONDS);
onContainerExpired.run();
http://git-wip-us.apache.org/repos/asf/samza/blob/aba73930/samza-core/src/main/java/org/apache/samza/container/SamzaContainerExceptionHandler.java
----------------------------------------------------------------------
diff --git a/samza-core/src/main/java/org/apache/samza/container/SamzaContainerExceptionHandler.java b/samza-core/src/main/java/org/apache/samza/container/SamzaContainerExceptionHandler.java
index 2a01cd7..229f5ef 100644
--- a/samza-core/src/main/java/org/apache/samza/container/SamzaContainerExceptionHandler.java
+++ b/samza-core/src/main/java/org/apache/samza/container/SamzaContainerExceptionHandler.java
@@ -52,7 +52,7 @@ public class SamzaContainerExceptionHandler implements UncaughtExceptionHandler
System.err.println(msg);
e.printStackTrace(System.err);
try {
- Util.printThreadDump("Thread dump from uncaught exception handler.");
+ Util.logThreadDump("Thread dump from uncaught exception handler.");
runnable.run();
} catch (Throwable throwable) {
// Ignore to avoid further exception propagation
http://git-wip-us.apache.org/repos/asf/samza/blob/aba73930/samza-core/src/main/java/org/apache/samza/task/TaskCallbackManager.java
----------------------------------------------------------------------
diff --git a/samza-core/src/main/java/org/apache/samza/task/TaskCallbackManager.java b/samza-core/src/main/java/org/apache/samza/task/TaskCallbackManager.java
index 036706f..36e39ba 100644
--- a/samza-core/src/main/java/org/apache/samza/task/TaskCallbackManager.java
+++ b/samza-core/src/main/java/org/apache/samza/task/TaskCallbackManager.java
@@ -101,7 +101,7 @@ class TaskCallbackManager {
Runnable timerTask = new Runnable() {
@Override
public void run() {
- Util.printThreadDump("Thread dump at task callback timeout");
+ Util.logThreadDump("Thread dump at task callback timeout");
String msg = "Callback for task {} " + callback.taskName + " timed out after " + timeout + " ms.";
callback.failure(new SamzaException(msg));
}
http://git-wip-us.apache.org/repos/asf/samza/blob/aba73930/samza-core/src/main/scala/org/apache/samza/container/SamzaContainer.scala
----------------------------------------------------------------------
diff --git a/samza-core/src/main/scala/org/apache/samza/container/SamzaContainer.scala b/samza-core/src/main/scala/org/apache/samza/container/SamzaContainer.scala
index a5b172d..aa5187b 100644
--- a/samza-core/src/main/scala/org/apache/samza/container/SamzaContainer.scala
+++ b/samza-core/src/main/scala/org/apache/samza/container/SamzaContainer.scala
@@ -954,7 +954,7 @@ class SamzaContainer(
info("Shutdown complete")
} else {
error("Did not shut down within %s ms, exiting." format shutdownMs)
- Util.printThreadDump("Thread dump from Samza Container Shutdown Hook.")
+ Util.logThreadDump("Thread dump from Samza Container Shutdown Hook.")
}
}
}
http://git-wip-us.apache.org/repos/asf/samza/blob/aba73930/samza-core/src/main/scala/org/apache/samza/util/Util.scala
----------------------------------------------------------------------
diff --git a/samza-core/src/main/scala/org/apache/samza/util/Util.scala b/samza-core/src/main/scala/org/apache/samza/util/Util.scala
index a50ffeb..e12c81a 100644
--- a/samza-core/src/main/scala/org/apache/samza/util/Util.scala
+++ b/samza-core/src/main/scala/org/apache/samza/util/Util.scala
@@ -433,7 +433,7 @@ object Util extends Logging {
}
}
- def printThreadDump(message: String): Unit = {
+ def logThreadDump(message: String): Unit = {
try {
val threadInfo = ThreadMxBean.dumpAllThreads(true, true)
val sb = new StringBuilder
@@ -441,10 +441,10 @@ object Util extends Logging {
for (ti <- threadInfo) {
sb.append(ti.toString).append("\n")
}
- System.out.println(sb)
+ info(sb)
} catch {
case e: Exception =>
- System.out.println("Could not get and log a thread dump", e)
+ info("Could not get and log a thread dump", e)
}
}
}