forked from apache/spark
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
11 changed files
with
193 additions
and
149 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
64 changes: 26 additions & 38 deletions
64
core/src/main/scala/spark/deploy/master/MasterInstrumentation.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,47 +1,35 @@ | ||
| package spark.deploy.master | ||
|
|
||
| import com.codahale.metrics.{Gauge, JmxReporter, MetricRegistry} | ||
| import java.util.{Map, HashMap => JHashMap} | ||
|
|
||
| import spark.metrics.AbstractInstrumentation | ||
| import com.codahale.metrics.{Gauge, Metric} | ||
|
|
||
| private[spark] trait MasterInstrumentation extends AbstractInstrumentation { | ||
| var masterInst: Option[Master] = None | ||
| val metricRegistry = new MetricRegistry() | ||
|
|
||
| override def registryHandler = metricRegistry | ||
|
|
||
| override def instance = "master" | ||
| import spark.metrics.source.Source | ||
|
|
||
| private[spark] class MasterInstrumentation(val master: Master) extends Source { | ||
| val className = classOf[Master].getName() | ||
| val instrumentationName = "master" | ||
| override def sourceName = instrumentationName | ||
|
|
||
| def initialize(master: Master) { | ||
| masterInst = Some(master) | ||
| override def getMetrics(): Map[String, Metric] = { | ||
| val gauges = new JHashMap[String, Metric] | ||
|
|
||
| // Register all the sources | ||
| registerSources() | ||
| // Gauge for worker numbers in cluster | ||
| gauges.put(className + ".workers.number", new Gauge[Int] { | ||
| override def getValue: Int = master.workers.size | ||
| }) | ||
|
|
||
| // Register and start all the sinks | ||
| registerSinks() | ||
| } | ||
|
|
||
| def uninitialize() { | ||
| unregisterSinks() | ||
| // Gauge for application numbers in cluster | ||
| gauges.put(className + ".apps.number", new Gauge[Int] { | ||
| override def getValue: Int = master.apps.size | ||
| }) | ||
|
|
||
| // Gauge for waiting application numbers in cluster | ||
| gauges.put(className + ".waiting_apps.number", new Gauge[Int] { | ||
| override def getValue: Int = master.waitingApps.size | ||
| }) | ||
|
|
||
| gauges | ||
| } | ||
|
|
||
| // Gauge for worker numbers in cluster | ||
| metricRegistry.register(MetricRegistry.name(classOf[Master], "workers", "number"), | ||
| new Gauge[Int] { | ||
| override def getValue: Int = masterInst.map(_.workers.size).getOrElse(0) | ||
| }) | ||
|
|
||
| // Gauge for application numbers in cluster | ||
| metricRegistry.register(MetricRegistry.name(classOf[Master], "apps", "number"), | ||
| new Gauge[Int] { | ||
| override def getValue: Int = masterInst.map(_.apps.size).getOrElse(0) | ||
| }) | ||
|
|
||
| // Gauge for waiting application numbers in cluster | ||
| metricRegistry.register(MetricRegistry.name(classOf[Master], "waiting_apps", "number"), | ||
| new Gauge[Int] { | ||
| override def getValue: Int = masterInst.map(_.waitingApps.size).getOrElse(0) | ||
| }) | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
131 changes: 81 additions & 50 deletions
131
core/src/main/scala/spark/deploy/worker/WorkerInstrumentation.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,58 +1,89 @@ | ||
| package spark.deploy.worker | ||
|
|
||
| import com.codahale.metrics.{JmxReporter, Gauge, MetricRegistry} | ||
| import com.codahale.metrics.{Gauge, Metric} | ||
|
|
||
| import spark.metrics.AbstractInstrumentation | ||
| import java.util.{Map, HashMap => JHashMap} | ||
|
|
||
| private[spark] trait WorkerInstrumentation extends AbstractInstrumentation { | ||
| var workerInst: Option[Worker] = None | ||
| val metricRegistry = new MetricRegistry() | ||
|
|
||
| override def registryHandler = metricRegistry | ||
|
|
||
| override def instance = "worker" | ||
| import spark.metrics.source.Source | ||
|
|
||
| private[spark] class WorkerInstrumentation(val worker: Worker) extends Source { | ||
| val className = classOf[Worker].getName() | ||
|
|
||
| def initialize(worker: Worker) { | ||
| workerInst = Some(worker) | ||
| override def sourceName = "worker" | ||
|
|
||
| // Register all the sources | ||
| registerSources() | ||
| override def getMetrics: Map[String, Metric] = { | ||
| val gauges = new JHashMap[String, Metric] | ||
|
|
||
| // Register and start all the sinks | ||
| registerSinks() | ||
| } | ||
|
|
||
| def uninitialize() { | ||
| unregisterSinks() | ||
| // Gauge for executors number | ||
| gauges.put(className + ".executor.number", new Gauge[Int]{ | ||
| override def getValue: Int = worker.executors.size | ||
| }) | ||
|
|
||
| gauges.put(className + ".core_used.number", new Gauge[Int]{ | ||
| override def getValue: Int = worker.coresUsed | ||
| }) | ||
|
|
||
| gauges.put(className + ".mem_used.MBytes", new Gauge[Int]{ | ||
| override def getValue: Int = worker.memoryUsed | ||
| }) | ||
|
|
||
| gauges.put(className + ".core_free.number", new Gauge[Int]{ | ||
| override def getValue: Int = worker.coresFree | ||
| }) | ||
|
|
||
| gauges.put(className + ".mem_free.MBytes", new Gauge[Int]{ | ||
| override def getValue: Int = worker.memoryFree | ||
| }) | ||
|
|
||
| gauges | ||
| } | ||
|
|
||
| // Gauge for executors number | ||
| metricRegistry.register(MetricRegistry.name(classOf[Worker], "executor", "number"), | ||
| new Gauge[Int] { | ||
| override def getValue: Int = workerInst.map(_.executors.size).getOrElse(0) | ||
| }) | ||
|
|
||
| // Gauge for cores used of this worker | ||
| metricRegistry.register(MetricRegistry.name(classOf[Worker], "core_used", "number"), | ||
| new Gauge[Int] { | ||
| override def getValue: Int = workerInst.map(_.coresUsed).getOrElse(0) | ||
| }) | ||
|
|
||
| // Gauge for memory used of this worker | ||
| metricRegistry.register(MetricRegistry.name(classOf[Worker], "mem_used", "MBytes"), | ||
| new Gauge[Int] { | ||
| override def getValue: Int = workerInst.map(_.memoryUsed).getOrElse(0) | ||
| }) | ||
|
|
||
| // Gauge for cores free of this worker | ||
| metricRegistry.register(MetricRegistry.name(classOf[Worker], "core_free", "number"), | ||
| new Gauge[Int] { | ||
| override def getValue: Int = workerInst.map(_.coresFree).getOrElse(0) | ||
| }) | ||
|
|
||
| // Gauge for memory used of this worker | ||
| metricRegistry.register(MetricRegistry.name(classOf[Worker], "mem_free", "MBytes"), | ||
| new Gauge[Int] { | ||
| override def getValue: Int = workerInst.map(_.memoryFree).getOrElse(0) | ||
| }) | ||
| } | ||
| } | ||
| //private[spark] trait WorkerInstrumentation extends AbstractInstrumentation { | ||
| // var workerInst: Option[Worker] = None | ||
| // val metricRegistry = new MetricRegistry() | ||
| // | ||
| // override def registryHandler = metricRegistry | ||
| // | ||
| // override def instance = "worker" | ||
| // | ||
| // def initialize(worker: Worker) { | ||
| // workerInst = Some(worker) | ||
| // | ||
| // registerSources() | ||
| // registerSinks() | ||
| // } | ||
| // | ||
| // def uninitialize() { | ||
| // unregisterSinks() | ||
| // } | ||
| // | ||
| // // Gauge for executors number | ||
| // metricRegistry.register(MetricRegistry.name(classOf[Worker], "executor", "number"), | ||
| // new Gauge[Int] { | ||
| // override def getValue: Int = workerInst.map(_.executors.size).getOrElse(0) | ||
| // }) | ||
| // | ||
| // // Gauge for cores used of this worker | ||
| // metricRegistry.register(MetricRegistry.name(classOf[Worker], "core_used", "number"), | ||
| // new Gauge[Int] { | ||
| // override def getValue: Int = workerInst.map(_.coresUsed).getOrElse(0) | ||
| // }) | ||
| // | ||
| // // Gauge for memory used of this worker | ||
| // metricRegistry.register(MetricRegistry.name(classOf[Worker], "mem_used", "MBytes"), | ||
| // new Gauge[Int] { | ||
| // override def getValue: Int = workerInst.map(_.memoryUsed).getOrElse(0) | ||
| // }) | ||
| // | ||
| // // Gauge for cores free of this worker | ||
| // metricRegistry.register(MetricRegistry.name(classOf[Worker], "core_free", "number"), | ||
| // new Gauge[Int] { | ||
| // override def getValue: Int = workerInst.map(_.coresFree).getOrElse(0) | ||
| // }) | ||
| // | ||
| // // Gauge for memory used of this worker | ||
| // metricRegistry.register(MetricRegistry.name(classOf[Worker], "mem_free", "MBytes"), | ||
| // new Gauge[Int] { | ||
| // override def getValue: Int = workerInst.map(_.memoryFree).getOrElse(0) | ||
| // }) | ||
| //} |
Oops, something went wrong.