You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by ma...@apache.org on 2013/12/28 04:09:11 UTC
[1/2] git commit: Remove unused hasPendingTasks methods
Updated Branches:
refs/heads/master 19672dca3 -> b579b8327
Remove unused hasPendingTasks methods
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/8419148e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/8419148e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/8419148e
Branch: refs/heads/master
Commit: 8419148e5fa54b5e3dd6b95fd5176b71506a951e
Parents: 19672dc
Author: Kay Ousterhout <ka...@gmail.com>
Authored: Fri Dec 27 15:14:38 2013 -0800
Committer: Kay Ousterhout <ka...@gmail.com>
Committed: Fri Dec 27 15:19:42 2013 -0800
----------------------------------------------------------------------
core/src/main/scala/org/apache/spark/scheduler/Pool.scala | 4 ----
.../main/scala/org/apache/spark/scheduler/Schedulable.scala | 1 -
.../scala/org/apache/spark/scheduler/TaskSchedulerImpl.scala | 7 -------
.../scala/org/apache/spark/scheduler/TaskSetManager.scala | 4 ----
4 files changed, 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/8419148e/core/src/main/scala/org/apache/spark/scheduler/Pool.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/scheduler/Pool.scala b/core/src/main/scala/org/apache/spark/scheduler/Pool.scala
index 596f9ad..1791242 100644
--- a/core/src/main/scala/org/apache/spark/scheduler/Pool.scala
+++ b/core/src/main/scala/org/apache/spark/scheduler/Pool.scala
@@ -117,8 +117,4 @@ private[spark] class Pool(
parent.decreaseRunningTasks(taskNum)
}
}
-
- override def hasPendingTasks(): Boolean = {
- schedulableQueue.exists(_.hasPendingTasks())
- }
}
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/8419148e/core/src/main/scala/org/apache/spark/scheduler/Schedulable.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/scheduler/Schedulable.scala b/core/src/main/scala/org/apache/spark/scheduler/Schedulable.scala
index 1c7ea2d..d573e12 100644
--- a/core/src/main/scala/org/apache/spark/scheduler/Schedulable.scala
+++ b/core/src/main/scala/org/apache/spark/scheduler/Schedulable.scala
@@ -42,5 +42,4 @@ private[spark] trait Schedulable {
def executorLost(executorId: String, host: String): Unit
def checkSpeculatableTasks(): Boolean
def getSortedTaskSetQueue(): ArrayBuffer[TaskSetManager]
- def hasPendingTasks(): Boolean
}
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/8419148e/core/src/main/scala/org/apache/spark/scheduler/TaskSchedulerImpl.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/scheduler/TaskSchedulerImpl.scala b/core/src/main/scala/org/apache/spark/scheduler/TaskSchedulerImpl.scala
index dbac6b9..1b0f82f 100644
--- a/core/src/main/scala/org/apache/spark/scheduler/TaskSchedulerImpl.scala
+++ b/core/src/main/scala/org/apache/spark/scheduler/TaskSchedulerImpl.scala
@@ -365,13 +365,6 @@ private[spark] class TaskSchedulerImpl(
}
}
- // Check for pending tasks in all our active jobs.
- def hasPendingTasks: Boolean = {
- synchronized {
- rootPool.hasPendingTasks()
- }
- }
-
def executorLost(executorId: String, reason: ExecutorLossReason) {
var failedExecutor: Option[String] = None
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/8419148e/core/src/main/scala/org/apache/spark/scheduler/TaskSetManager.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/scheduler/TaskSetManager.scala b/core/src/main/scala/org/apache/spark/scheduler/TaskSetManager.scala
index c676e73..9b95e41 100644
--- a/core/src/main/scala/org/apache/spark/scheduler/TaskSetManager.scala
+++ b/core/src/main/scala/org/apache/spark/scheduler/TaskSetManager.scala
@@ -681,10 +681,6 @@ private[spark] class TaskSetManager(
return foundTasks
}
- override def hasPendingTasks(): Boolean = {
- numTasks > 0 && tasksSuccessful < numTasks
- }
-
private def getLocalityWait(level: TaskLocality.TaskLocality): Long = {
val defaultWait = System.getProperty("spark.locality.wait", "3000")
level match {
[2/2] git commit: Merge pull request #306 from
kayousterhout/remove_pending
Posted by ma...@apache.org.
Merge pull request #306 from kayousterhout/remove_pending
Remove unused hasPendingTasks methods
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/b579b832
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/b579b832
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/b579b832
Branch: refs/heads/master
Commit: b579b83277e30abbfd952e169bba19dee878f85e
Parents: 19672dc 8419148
Author: Matei Zaharia <ma...@databricks.com>
Authored: Fri Dec 27 22:09:04 2013 -0500
Committer: Matei Zaharia <ma...@databricks.com>
Committed: Fri Dec 27 22:09:04 2013 -0500
----------------------------------------------------------------------
core/src/main/scala/org/apache/spark/scheduler/Pool.scala | 4 ----
.../main/scala/org/apache/spark/scheduler/Schedulable.scala | 1 -
.../scala/org/apache/spark/scheduler/TaskSchedulerImpl.scala | 7 -------
.../scala/org/apache/spark/scheduler/TaskSetManager.scala | 4 ----
4 files changed, 16 deletions(-)
----------------------------------------------------------------------