You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by uc...@apache.org on 2014/11/21 16:20:50 UTC
incubator-flink git commit: Log memory usage stats at INFO level
instead of DEBUG
Repository: incubator-flink
Updated Branches:
refs/heads/master a69d60ae3 -> 02e2857a9
Log memory usage stats at INFO level instead of DEBUG
Project: http://git-wip-us.apache.org/repos/asf/incubator-flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-flink/commit/02e2857a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-flink/tree/02e2857a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-flink/diff/02e2857a
Branch: refs/heads/master
Commit: 02e2857a94adc7e427f36180542196331e8ae871
Parents: a69d60a
Author: uce <uc...@apache.org>
Authored: Fri Nov 21 16:20:42 2014 +0100
Committer: uce <uc...@apache.org>
Committed: Fri Nov 21 16:20:42 2014 +0100
----------------------------------------------------------------------
.../flink/runtime/taskmanager/TaskManager.java | 22 +++++++++-----------
1 file changed, 10 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/02e2857a/flink-runtime/src/main/java/org/apache/flink/runtime/taskmanager/TaskManager.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/taskmanager/TaskManager.java b/flink-runtime/src/main/java/org/apache/flink/runtime/taskmanager/TaskManager.java
index 10cbb8a..58529b8 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/taskmanager/TaskManager.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/taskmanager/TaskManager.java
@@ -389,7 +389,7 @@ public class TaskManager implements TaskOperationProtocol {
ConfigConstants.TASK_MANAGER_DEBUG_MEMORY_USAGE_START_LOG_THREAD,
ConfigConstants.DEFAULT_TASK_MANAGER_DEBUG_MEMORY_USAGE_START_LOG_THREAD);
- if (startMemoryUsageLogThread && LOG.isDebugEnabled()) {
+ if (startMemoryUsageLogThread) {
final int logIntervalMs = GlobalConfiguration.getInteger(
ConfigConstants.TASK_MANAGER_DEBUG_MEMORY_USAGE_LOG_INTERVAL_MS,
ConfigConstants.DEFAULT_TASK_MANAGER_DEBUG_MEMORY_USAGE_LOG_INTERVAL_MS);
@@ -401,10 +401,8 @@ public class TaskManager implements TaskOperationProtocol {
while (!isShutDown()) {
Thread.sleep(logIntervalMs);
- if (LOG.isDebugEnabled()) {
- LOG.debug(getMemoryUsageStatsAsString(memoryMXBean));
- LOG.debug(getGarbageCollectorStatsAsString(gcMXBeans));
- }
+ LOG.info(getMemoryUsageStatsAsString(memoryMXBean));
+ LOG.info(getGarbageCollectorStatsAsString(gcMXBeans));
}
} catch (InterruptedException e) {
LOG.warn("Unexpected interruption of memory usage logger thread.");
@@ -896,15 +894,15 @@ public class TaskManager implements TaskOperationProtocol {
MemoryUsage heap = memoryMXBean.getHeapMemoryUsage();
MemoryUsage nonHeap = memoryMXBean.getNonHeapMemoryUsage();
- int mb = 1 << 20;
+ int mb = 20;
- int heapUsed = (int) (heap.getUsed() / mb);
- int heapCommitted = (int) (heap.getCommitted() / mb);
- int heapMax = (int) (heap.getMax() / mb);
+ long heapUsed = heap.getUsed() >> mb;
+ long heapCommitted = heap.getCommitted() >> mb;
+ long heapMax = heap.getMax() >> mb;
- int nonHeapUsed = (int) (nonHeap.getUsed() / mb);
- int nonHeapCommitted = (int) (nonHeap.getCommitted() / mb);
- int nonHeapMax = (int) (nonHeap.getMax() / mb);
+ long nonHeapUsed = nonHeap.getUsed() >> mb;
+ long nonHeapCommitted = nonHeap.getCommitted() >> mb;
+ long nonHeapMax = nonHeap.getMax() >> mb;
String msg = String.format("Memory usage stats: [HEAP: %d/%d/%d MB, NON HEAP: %d/%d/%d MB (used/comitted/max)]",
heapUsed, heapCommitted, heapMax, nonHeapUsed, nonHeapCommitted, nonHeapMax);