From 05637de8423da85c5934cdfa8f07254133a58474 Mon Sep 17 00:00:00 2001
From: Andrew xia <junluan.xia@intel.com>
Date: Wed, 3 Jul 2013 21:16:39 +0800
Subject: [PATCH] Change class xxxInstrumentation to class xxxSource
---
core/src/main/scala/spark/deploy/master/Master.scala | 4 ++--
.../{MasterInstrumentation.scala => MasterSource.scala} | 2 +-
core/src/main/scala/spark/deploy/worker/Worker.scala | 4 ++--
.../{WorkerInstrumentation.scala => WorkerSource.scala} | 2 +-
core/src/main/scala/spark/executor/Executor.scala | 4 ++--
.../{ExecutorInstrumentation.scala => ExecutorSource.scala} | 2 +-
core/src/test/scala/spark/metrics/MetricsSystemSuite.scala | 2 +-
7 files changed, 10 insertions(+), 10 deletions(-)
rename core/src/main/scala/spark/deploy/master/{MasterInstrumentation.scala => MasterSource.scala} (90%)
rename core/src/main/scala/spark/deploy/worker/{WorkerInstrumentation.scala => WorkerSource.scala} (93%)
rename core/src/main/scala/spark/executor/{ExecutorInstrumentation.scala => ExecutorSource.scala} (94%)
diff --git a/core/src/main/scala/spark/deploy/master/Master.scala b/core/src/main/scala/spark/deploy/master/Master.scala
index 5f67366eb6..1d592206c0 100644
--- a/core/src/main/scala/spark/deploy/master/Master.scala
+++ b/core/src/main/scala/spark/deploy/master/Master.scala
@@ -58,7 +58,7 @@ private[spark] class Master(host: String, port: Int, webUiPort: Int) extends Act
Utils.checkHost(host, "Expected hostname")
- val masterInstrumentation = new MasterInstrumentation(this)
+ val masterSource = new MasterSource(this)
val masterPublicAddress = {
val envVar = System.getenv("SPARK_PUBLIC_DNS")
@@ -77,7 +77,7 @@ private[spark] class Master(host: String, port: Int, webUiPort: Int) extends Act
webUi.start()
context.system.scheduler.schedule(0 millis, WORKER_TIMEOUT millis)(timeOutDeadWorkers())
- Master.metricsSystem.registerSource(masterInstrumentation)
+ Master.metricsSystem.registerSource(masterSource)
Master.metricsSystem.start()
}
diff --git a/core/src/main/scala/spark/deploy/master/MasterInstrumentation.scala b/core/src/main/scala/spark/deploy/master/MasterSource.scala
similarity index 90%
rename from core/src/main/scala/spark/deploy/master/MasterInstrumentation.scala
rename to core/src/main/scala/spark/deploy/master/MasterSource.scala
index 4c3708cc4c..f94e5b2c34 100644
--- a/core/src/main/scala/spark/deploy/master/MasterInstrumentation.scala
+++ b/core/src/main/scala/spark/deploy/master/MasterSource.scala
@@ -4,7 +4,7 @@ import com.codahale.metrics.{Gauge,MetricRegistry}
import spark.metrics.source.Source
-private[spark] class MasterInstrumentation(val master: Master) extends Source {
+private[spark] class MasterSource(val master: Master) extends Source {
val metricRegistry = new MetricRegistry()
val sourceName = "master"
diff --git a/core/src/main/scala/spark/deploy/worker/Worker.scala b/core/src/main/scala/spark/deploy/worker/Worker.scala
index eaa1c1806f..5c0f77fd75 100644
--- a/core/src/main/scala/spark/deploy/worker/Worker.scala
+++ b/core/src/main/scala/spark/deploy/worker/Worker.scala
@@ -68,7 +68,7 @@ private[spark] class Worker(
var coresUsed = 0
var memoryUsed = 0
- val workerInstrumentation = new WorkerInstrumentation(this)
+ val workerSource = new WorkerSource(this)
def coresFree: Int = cores - coresUsed
def memoryFree: Int = memory - memoryUsed
@@ -102,7 +102,7 @@ private[spark] class Worker(
connectToMaster()
startWebUi()
- Worker.metricsSystem.registerSource(workerInstrumentation)
+ Worker.metricsSystem.registerSource(workerSource)
Worker.metricsSystem.start()
}
diff --git a/core/src/main/scala/spark/deploy/worker/WorkerInstrumentation.scala b/core/src/main/scala/spark/deploy/worker/WorkerSource.scala
similarity index 93%
rename from core/src/main/scala/spark/deploy/worker/WorkerInstrumentation.scala
rename to core/src/main/scala/spark/deploy/worker/WorkerSource.scala
index c76c0b4711..539eac71bd 100644
--- a/core/src/main/scala/spark/deploy/worker/WorkerInstrumentation.scala
+++ b/core/src/main/scala/spark/deploy/worker/WorkerSource.scala
@@ -4,7 +4,7 @@ import com.codahale.metrics.{Gauge, MetricRegistry}
import spark.metrics.source.Source
-private[spark] class WorkerInstrumentation(val worker: Worker) extends Source {
+private[spark] class WorkerSource(val worker: Worker) extends Source {
val sourceName = "worker"
val metricRegistry = new MetricRegistry()
diff --git a/core/src/main/scala/spark/executor/Executor.scala b/core/src/main/scala/spark/executor/Executor.scala
index 4ea05dec1c..8a74a8d853 100644
--- a/core/src/main/scala/spark/executor/Executor.scala
+++ b/core/src/main/scala/spark/executor/Executor.scala
@@ -87,12 +87,12 @@ private[spark] class Executor(executorId: String, slaveHostname: String, propert
}
)
- val executorInstrumentation = new ExecutorInstrumentation(this)
+ val executorSource = new ExecutorSource(this)
// Initialize Spark environment (using system properties read above)
val env = SparkEnv.createFromSystemProperties(executorId, slaveHostname, 0, false, false)
SparkEnv.set(env)
- env.metricsSystem.registerSource(executorInstrumentation)
+ env.metricsSystem.registerSource(executorSource)
private val akkaFrameSize = env.actorSystem.settings.config.getBytes("akka.remote.netty.message-frame-size")
diff --git a/core/src/main/scala/spark/executor/ExecutorInstrumentation.scala b/core/src/main/scala/spark/executor/ExecutorSource.scala
similarity index 94%
rename from core/src/main/scala/spark/executor/ExecutorInstrumentation.scala
rename to core/src/main/scala/spark/executor/ExecutorSource.scala
index ad406f41b4..d8b531cb58 100644
--- a/core/src/main/scala/spark/executor/ExecutorInstrumentation.scala
+++ b/core/src/main/scala/spark/executor/ExecutorSource.scala
@@ -4,7 +4,7 @@ import com.codahale.metrics.{Gauge, MetricRegistry}
import spark.metrics.source.Source
-class ExecutorInstrumentation(val executor: Executor) extends Source {
+class ExecutorSource(val executor: Executor) extends Source {
val metricRegistry = new MetricRegistry()
val sourceName = "executor"
diff --git a/core/src/test/scala/spark/metrics/MetricsSystemSuite.scala b/core/src/test/scala/spark/metrics/MetricsSystemSuite.scala
index f29bb9db67..462c28e894 100644
--- a/core/src/test/scala/spark/metrics/MetricsSystemSuite.scala
+++ b/core/src/test/scala/spark/metrics/MetricsSystemSuite.scala
@@ -33,7 +33,7 @@ class MetricsSystemSuite extends FunSuite with BeforeAndAfter {
assert(sources.length === 1)
assert(sinks.length === 2)
- val source = new spark.deploy.master.MasterInstrumentation(null)
+ val source = new spark.deploy.master.MasterSource(null)
metricsSystem.registerSource(source)
assert(sources.length === 2)
}
--
GitLab