asfgit closed pull request #22279: [SPARK-25277][YARN] YARN applicationMaster
metrics should not register static metrics
URL: https://github.com/apache/spark/pull/22279
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/core/src/main/scala/org/apache/spark/metrics/MetricsSystem.scala
b/core/src/main/scala/org/apache/spark/metrics/MetricsSystem.scala
index 3457a2632277d..1894033bbbf14 100644
--- a/core/src/main/scala/org/apache/spark/metrics/MetricsSystem.scala
+++ b/core/src/main/scala/org/apache/spark/metrics/MetricsSystem.scala
@@ -94,11 +94,13 @@ private[spark] class MetricsSystem private (
metricsConfig.initialize()
- def start() {
+ def start(registerStaticSources: Boolean = true) {
require(!running, "Attempting to start a MetricsSystem that is already
running")
running = true
- StaticSources.allSources.foreach(registerSource)
- registerSources()
+ if (registerStaticSources) {
+ StaticSources.allSources.foreach(registerSource)
+ registerSources()
+ }
registerSinks()
sinks.foreach(_.start)
}
diff --git
a/resource-managers/yarn/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMaster.scala
b/resource-managers/yarn/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMaster.scala
index 55ed114f8500f..5be67d31cf6ae 100644
---
a/resource-managers/yarn/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMaster.scala
+++
b/resource-managers/yarn/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMaster.scala
@@ -450,7 +450,8 @@ private[spark] class ApplicationMaster(args:
ApplicationMasterArguments) extends
val ms = MetricsSystem.createMetricsSystem("applicationMaster", sparkConf,
securityMgr)
val prefix = _sparkConf.get(YARN_METRICS_NAMESPACE).getOrElse(appId)
ms.registerSource(new ApplicationMasterSource(prefix, allocator))
- ms.start()
+ // do not register static sources in this case as per SPARK-25277
+ ms.start(false)
metricsSystem = Some(ms)
reporterThread = launchReporterThread()
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
