Repository: flink Updated Branches: refs/heads/master a11c1c640 -> 4c4a6f19d
[hotfix] Refactor TM Metric instantiation -formatting -don't use implicit conversions -fixed ObjectName for mapped bufferpool Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/4c4a6f19 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/4c4a6f19 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/4c4a6f19 Branch: refs/heads/master Commit: 4c4a6f19dace21a318ae70d1e61d4f47eab4a40f Parents: 9e540da Author: zentol <[email protected]> Authored: Fri Jul 1 14:21:00 2016 +0200 Committer: zentol <[email protected]> Committed: Fri Jul 1 15:09:16 2016 +0200 ---------------------------------------------------------------------- .../flink/runtime/taskmanager/TaskManager.scala | 58 ++++++++++---------- 1 file changed, 29 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/4c4a6f19/flink-runtime/src/main/scala/org/apache/flink/runtime/taskmanager/TaskManager.scala ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/scala/org/apache/flink/runtime/taskmanager/TaskManager.scala b/flink-runtime/src/main/scala/org/apache/flink/runtime/taskmanager/TaskManager.scala index c7ad901..2e2e6bc 100644 --- a/flink-runtime/src/main/scala/org/apache/flink/runtime/taskmanager/TaskManager.scala +++ b/flink-runtime/src/main/scala/org/apache/flink/runtime/taskmanager/TaskManager.scala @@ -2322,22 +2322,22 @@ object TaskManager { override def getValue: Long = mxBean.getHeapMemoryUsage.getUsed }) heap.gauge[Long, FlinkGauge[Long]]("Committed", new FlinkGauge[Long] { - override def getValue: Long = mxBean.getHeapMemoryUsage.getCommitted - }) + override def getValue: Long = mxBean.getHeapMemoryUsage.getCommitted + }) heap.gauge[Long, FlinkGauge[Long]]("Max", new FlinkGauge[Long] { - override def getValue: Long = mxBean.getHeapMemoryUsage.getMax - }) + override def getValue: Long = mxBean.getHeapMemoryUsage.getMax + }) val nonHeap = metrics.addGroup("NonHeap") nonHeap.gauge[Long, FlinkGauge[Long]]("Used", new FlinkGauge[Long] { - override def getValue: Long = mxBean.getNonHeapMemoryUsage.getUsed - }) + override def getValue: Long = mxBean.getNonHeapMemoryUsage.getUsed + }) nonHeap.gauge[Long, FlinkGauge[Long]]("Committed", new FlinkGauge[Long] { - override def getValue: Long = mxBean.getNonHeapMemoryUsage.getCommitted - }) + override def getValue: Long = mxBean.getNonHeapMemoryUsage.getCommitted + }) nonHeap.gauge[Long, FlinkGauge[Long]]("Max", new FlinkGauge[Long] { - override def getValue: Long = mxBean.getNonHeapMemoryUsage.getMax - }) + override def getValue: Long = mxBean.getNonHeapMemoryUsage.getMax + }) val con = ManagementFactory.getPlatformMBeanServer; @@ -2345,33 +2345,33 @@ object TaskManager { val direct = metrics.addGroup("Direct") direct.gauge[Long, FlinkGauge[Long]]("Count", new FlinkGauge[Long] { - override def getValue: Long = con - .getAttribute(directObjectName, "Count").asInstanceOf[Long] - }) + override def getValue: Long = con + .getAttribute(directObjectName, "Count").asInstanceOf[Long] + }) direct.gauge[Long, FlinkGauge[Long]]("MemoryUsed", new FlinkGauge[Long] { - override def getValue: Long = con - .getAttribute(directObjectName, "MemoryUsed").asInstanceOf[Long] - }) + override def getValue: Long = con + .getAttribute(directObjectName, "MemoryUsed").asInstanceOf[Long] + }) direct.gauge[Long, FlinkGauge[Long]]("TotalCapacity", new FlinkGauge[Long] { - override def getValue: Long = con - .getAttribute(directObjectName, "TotalCapacity").asInstanceOf[Long] - }) + override def getValue: Long = con + .getAttribute(directObjectName, "TotalCapacity").asInstanceOf[Long] + }) - val mappedObjectName = new ObjectName("java.nio:type=BufferPool,name=direct") + val mappedObjectName = new ObjectName("java.nio:type=BufferPool,name=mapped") val mapped = metrics.addGroup("Mapped") mapped.gauge[Long, FlinkGauge[Long]]("Count", new FlinkGauge[Long] { - override def getValue: Long = con - .getAttribute(mappedObjectName, "Count").asInstanceOf[Long] - }) + override def getValue: Long = con + .getAttribute(mappedObjectName, "Count").asInstanceOf[Long] + }) mapped.gauge[Long, FlinkGauge[Long]]("MemoryUsed", new FlinkGauge[Long] { - override def getValue: Long = con - .getAttribute(mappedObjectName, "MemoryUsed").asInstanceOf[Long] - }) + override def getValue: Long = con + .getAttribute(mappedObjectName, "MemoryUsed").asInstanceOf[Long] + }) mapped.gauge[Long, FlinkGauge[Long]]("TotalCapacity", new FlinkGauge[Long] { - override def getValue: Long = con - .getAttribute(mappedObjectName, "TotalCapacity").asInstanceOf[Long] - }) + override def getValue: Long = con + .getAttribute(mappedObjectName, "TotalCapacity").asInstanceOf[Long] + }) } private def instantiateThreadMetrics(metrics: MetricGroup): Unit = {
