diff options
| author | jerryshao <saisai.shao@intel.com> | 2013-07-02 11:29:26 +0800 |
|---|---|---|
| committer | jerryshao <saisai.shao@intel.com> | 2013-07-24 14:57:47 +0800 |
| commit | a79f6077f0b3bc0110f6e8e15de3068f296f3b81 (patch) | |
| tree | b52dd8fe2fe2a25839db4d78f01bc1788c2c3669 | |
| parent | 1daff54b2ed92d0bcee7030d7d3ab5c274f80d2f (diff) | |
| download | spark-a79f6077f0b3bc0110f6e8e15de3068f296f3b81.tar.gz spark-a79f6077f0b3bc0110f6e8e15de3068f296f3b81.tar.bz2 spark-a79f6077f0b3bc0110f6e8e15de3068f296f3b81.zip | |
Add Maven metrics library dependency and code changes
| -rw-r--r-- | conf/metrics.properties | 4 | ||||
| -rw-r--r-- | core/pom.xml | 8 | ||||
| -rw-r--r-- | core/src/main/scala/spark/SparkEnv.scala | 3 | ||||
| -rw-r--r-- | pom.xml | 8 |
4 files changed, 20 insertions, 3 deletions
diff --git a/conf/metrics.properties b/conf/metrics.properties index 0bbb6b5229..2ea3aaf345 100644 --- a/conf/metrics.properties +++ b/conf/metrics.properties @@ -1,10 +1,10 @@ -# syntax: [prefix].[sink|source].[instance].[options] +# syntax: [instance].[sink|source].[name].[options] *.sink.console.period=10 *.sink.console.unit=second -master.source.jvm.class=spark.metrics.source.JvmSource +*.sink.console.class=spark.metrics.sink.ConsoleSink master.sink.console.period=10 diff --git a/core/pom.xml b/core/pom.xml index 6329b2fbd8..237d988712 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -108,6 +108,14 @@ <groupId>log4j</groupId> <artifactId>log4j</artifactId> </dependency> + <dependency> + <groupId>com.codahale.metrics</groupId> + <artifactId>metrics-core</artifactId> + </dependency> + <dependency> + <groupId>com.codahale.metrics</groupId> + <artifactId>metrics-jvm</artifactId> + </dependency> <dependency> <groupId>org.apache.derby</groupId> diff --git a/core/src/main/scala/spark/SparkEnv.scala b/core/src/main/scala/spark/SparkEnv.scala index 7b3dc69348..204049d927 100644 --- a/core/src/main/scala/spark/SparkEnv.scala +++ b/core/src/main/scala/spark/SparkEnv.scala @@ -24,6 +24,7 @@ import akka.actor.{Actor, ActorRef, Props, ActorSystemImpl, ActorSystem} import akka.remote.RemoteActorRefProvider import spark.broadcast.BroadcastManager +import spark.metrics.MetricsSystem import spark.storage.BlockManager import spark.storage.BlockManagerMaster import spark.network.ConnectionManager @@ -54,7 +55,7 @@ class SparkEnv ( val connectionManager: ConnectionManager, val httpFileServer: HttpFileServer, val sparkFilesDir: String, - val metricsSystem: metricsSystem, + val metricsSystem: MetricsSystem, // To be set only as part of initialization of SparkContext. // (executorId, defaultHostPort) => executorHostPort // If executorId is NOT found, return defaultHostPort @@ -268,6 +268,14 @@ <groupId>org.scala-lang</groupId> <artifactId>scalap</artifactId> <version>${scala.version}</version> + <groupId>com.codahale.metrics</groupId> + <artifactId>metrics-core</artifactId> + <version>3.0.0</version> + </dependency> + <dependency> + <groupId>com.codahale.metrics</groupId> + <artifactId>metrics-jvm</artifactId> + <version>3.0.0</version> </dependency> <dependency> |