You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by pw...@apache.org on 2013/12/20 20:57:03 UTC
[2/4] git commit: Remove firstApp from the standalone scheduler Master
Remove firstApp from the standalone scheduler Master
As a lonely child with no one to care for it... we had to put it down.
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/4d74b899
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/4d74b899
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/4d74b899
Branch: refs/heads/master
Commit: 4d74b899b7daff74054b70f38cddf7b38fe6c211
Parents: 1ab031e
Author: Aaron Davidson <aa...@databricks.com>
Authored: Thu Dec 19 17:53:41 2013 -0800
Committer: Aaron Davidson <aa...@databricks.com>
Committed: Thu Dec 19 17:53:41 2013 -0800
----------------------------------------------------------------------
.../scala/org/apache/spark/deploy/master/Master.scala | 10 ----------
1 file changed, 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/4d74b899/core/src/main/scala/org/apache/spark/deploy/master/Master.scala
----------------------------------------------------------------------
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 7b2b1c3..eebd079 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
@@ -61,8 +61,6 @@ private[spark] class Master(host: String, port: Int, webUiPort: Int) extends Act
val waitingApps = new ArrayBuffer[ApplicationInfo]
val completedApps = new ArrayBuffer[ApplicationInfo]
- var firstApp: Option[ApplicationInfo] = None
-
Utils.checkHost(host, "Expected hostname")
val masterMetricsSystem = MetricsSystem.createMetricsSystem("master")
@@ -441,14 +439,6 @@ private[spark] class Master(host: String, port: Int, webUiPort: Int) extends Act
idToApp(app.id) = app
actorToApp(app.driver) = app
addressToApp(appAddress) = app
- if (firstApp == None) {
- firstApp = Some(app)
- }
- // TODO: What is firstApp?? Can we remove it?
- val workersAlive = workers.filter(_.state == WorkerState.ALIVE).toArray
- if (workersAlive.size > 0 && !workersAlive.exists(_.memoryFree >= app.desc.memoryPerSlave)) {
- logWarning("Could not find any workers with enough memory for " + firstApp.get.id)
- }
waitingApps += app
}