You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by pw...@apache.org on 2013/10/09 21:15:14 UTC
[1/2] git commit: Use standard abbreviations in metrics labels
Updated Branches:
refs/heads/master b4fa11f6c -> 7b3ae04ea
Use standard abbreviations in metrics labels
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/bd3bcc5f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/bd3bcc5f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/bd3bcc5f
Branch: refs/heads/master
Commit: bd3bcc5f8e0db32679fe92705d0f7f3dd4360721
Parents: 19d445d
Author: Patrick Wendell <pw...@gmail.com>
Authored: Wed Oct 9 11:16:24 2013 -0700
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Wed Oct 9 11:16:24 2013 -0700
----------------------------------------------------------------------
.../scala/org/apache/spark/deploy/worker/WorkerSource.scala | 4 ++--
.../scala/org/apache/spark/storage/BlockManagerSource.scala | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/bd3bcc5f/core/src/main/scala/org/apache/spark/deploy/worker/WorkerSource.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/deploy/worker/WorkerSource.scala b/core/src/main/scala/org/apache/spark/deploy/worker/WorkerSource.scala
index b24e936..b7ddd8c 100644
--- a/core/src/main/scala/org/apache/spark/deploy/worker/WorkerSource.scala
+++ b/core/src/main/scala/org/apache/spark/deploy/worker/WorkerSource.scala
@@ -35,7 +35,7 @@ private[spark] class WorkerSource(val worker: Worker) extends Source {
})
// Gauge for memory used of this worker
- metricRegistry.register(MetricRegistry.name("memUsed_MBytes"), new Gauge[Int] {
+ metricRegistry.register(MetricRegistry.name("memUsed_MB"), new Gauge[Int] {
override def getValue: Int = worker.memoryUsed
})
@@ -45,7 +45,7 @@ private[spark] class WorkerSource(val worker: Worker) extends Source {
})
// Gauge for memory free of this worker
- metricRegistry.register(MetricRegistry.name("memFree_MBytes"), new Gauge[Int] {
+ metricRegistry.register(MetricRegistry.name("memFree_MB"), new Gauge[Int] {
override def getValue: Int = worker.memoryFree
})
}
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/bd3bcc5f/core/src/main/scala/org/apache/spark/storage/BlockManagerSource.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/storage/BlockManagerSource.scala b/core/src/main/scala/org/apache/spark/storage/BlockManagerSource.scala
index e5068d5..365866d 100644
--- a/core/src/main/scala/org/apache/spark/storage/BlockManagerSource.scala
+++ b/core/src/main/scala/org/apache/spark/storage/BlockManagerSource.scala
@@ -28,7 +28,7 @@ private[spark] class BlockManagerSource(val blockManager: BlockManager, sc: Spar
val metricRegistry = new MetricRegistry()
val sourceName = "%s.BlockManager".format(sc.appName)
- metricRegistry.register(MetricRegistry.name("memory", "maxMem_MBytes"), new Gauge[Long] {
+ metricRegistry.register(MetricRegistry.name("memory", "maxMem_MB"), new Gauge[Long] {
override def getValue: Long = {
val storageStatusList = blockManager.master.getStorageStatus
val maxMem = storageStatusList.map(_.maxMem).reduce(_ + _)
@@ -36,7 +36,7 @@ private[spark] class BlockManagerSource(val blockManager: BlockManager, sc: Spar
}
})
- metricRegistry.register(MetricRegistry.name("memory", "remainingMem_MBytes"), new Gauge[Long] {
+ metricRegistry.register(MetricRegistry.name("memory", "remainingMem_MB"), new Gauge[Long] {
override def getValue: Long = {
val storageStatusList = blockManager.master.getStorageStatus
val remainingMem = storageStatusList.map(_.memRemaining).reduce(_ + _)
@@ -44,7 +44,7 @@ private[spark] class BlockManagerSource(val blockManager: BlockManager, sc: Spar
}
})
- metricRegistry.register(MetricRegistry.name("memory", "memUsed_MBytes"), new Gauge[Long] {
+ metricRegistry.register(MetricRegistry.name("memory", "memUsed_MB"), new Gauge[Long] {
override def getValue: Long = {
val storageStatusList = blockManager.master.getStorageStatus
val maxMem = storageStatusList.map(_.maxMem).reduce(_ + _)
@@ -53,7 +53,7 @@ private[spark] class BlockManagerSource(val blockManager: BlockManager, sc: Spar
}
})
- metricRegistry.register(MetricRegistry.name("disk", "diskSpaceUsed_MBytes"), new Gauge[Long] {
+ metricRegistry.register(MetricRegistry.name("disk", "diskSpaceUsed_MB"), new Gauge[Long] {
override def getValue: Long = {
val storageStatusList = blockManager.master.getStorageStatus
val diskSpaceUsed = storageStatusList
[2/2] git commit: Merge pull request #45 from pwendell/metrics_units
Posted by pw...@apache.org.
Merge pull request #45 from pwendell/metrics_units
Use standard abbreviation in metrics description (MBytes -> MB)
This is a small change - older commits are shown here because Github hasn't sync'ed yet with apache.
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/7b3ae04e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/7b3ae04e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/7b3ae04e
Branch: refs/heads/master
Commit: 7b3ae04ea7f95ee9a8f09d4615d1c9fbfc475af5
Parents: b4fa11f bd3bcc5
Author: Patrick Wendell <pw...@gmail.com>
Authored: Wed Oct 9 12:14:19 2013 -0700
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Wed Oct 9 12:14:19 2013 -0700
----------------------------------------------------------------------
.../scala/org/apache/spark/deploy/worker/WorkerSource.scala | 4 ++--
.../scala/org/apache/spark/storage/BlockManagerSource.scala | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------