From 6dbfc40776514c3a5667161ebe7829f4cc9c7529 Mon Sep 17 00:00:00 2001
From: Raafat Akkad <raafat.akkad@gmail.com>
Date: Thu, 4 Feb 2016 16:09:31 -0800
Subject: [PATCH] [SPARK-13052] waitingApps metric doesn't show the number of
apps currently in the WAITING state
Author: Raafat Akkad <raafat.akkad@gmail.com>
Closes #10959 from RaafatAkkad/master.
---
core/src/main/scala/org/apache/spark/deploy/master/Master.scala | 2 +-
.../scala/org/apache/spark/deploy/master/MasterSource.scala | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/core/src/main/scala/org/apache/spark/deploy/master/Master.scala b/core/src/main/scala/org/apache/spark/deploy/master/Master.scala
index 202a1b787c..0f11f680b3 100644
--- a/core/src/main/scala/org/apache/spark/deploy/master/Master.scala
+++ b/core/src/main/scala/org/apache/spark/deploy/master/Master.scala
@@ -74,7 +74,7 @@ private[deploy] class Master(
val workers = new HashSet[WorkerInfo]
val idToApp = new HashMap[String, ApplicationInfo]
- val waitingApps = new ArrayBuffer[ApplicationInfo]
+ private val waitingApps = new ArrayBuffer[ApplicationInfo]
val apps = new HashSet[ApplicationInfo]
private val idToWorker = new HashMap[String, WorkerInfo]
diff --git a/core/src/main/scala/org/apache/spark/deploy/master/MasterSource.scala b/core/src/main/scala/org/apache/spark/deploy/master/MasterSource.scala
index 66a9ff3867..39b2647a90 100644
--- a/core/src/main/scala/org/apache/spark/deploy/master/MasterSource.scala
+++ b/core/src/main/scala/org/apache/spark/deploy/master/MasterSource.scala
@@ -42,6 +42,6 @@ private[spark] class MasterSource(val master: Master) extends Source {
// Gauge for waiting application numbers in cluster
metricRegistry.register(MetricRegistry.name("waitingApps"), new Gauge[Int] {
- override def getValue: Int = master.waitingApps.size
+ override def getValue: Int = master.apps.filter(_.state == ApplicationState.WAITING).size
})
}
--
GitLab