Repository: spark Updated Branches: refs/heads/branch-1.2 e21475d16 -> 2d83442f2
SPARK-794 [CORE] Backport. Remove sleep() in ClusterScheduler.stop Backport https://github.com/apache/spark/pull/3851 to branch 1.2: remove Thread.sleep(1000) in TaskSchedulerImpl. Teeing this up for Jenkins per discussion in the JIRA / PR. Author: Sean Owen <so...@cloudera.com> Closes #4793 from srowen/SPARK-795.2 and squashes the following commits: 5f5db4a [Sean Owen] Backport https://github.com/apache/spark/pull/3851 to branch 1.2: remove Thread.sleep(1000) in TaskSchedulerImpl Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/2d83442f Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/2d83442f Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/2d83442f Branch: refs/heads/branch-1.2 Commit: 2d83442f2e825042f044ec93c6162412304fbaeb Parents: e21475d Author: Sean Owen <so...@cloudera.com> Authored: Thu Feb 26 22:07:09 2015 +0000 Committer: Sean Owen <so...@cloudera.com> Committed: Thu Feb 26 22:07:09 2015 +0000 ---------------------------------------------------------------------- .../main/scala/org/apache/spark/scheduler/TaskSchedulerImpl.scala | 3 --- 1 file changed, 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/2d83442f/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 cd3c015..a41f3ee 100644 --- a/core/src/main/scala/org/apache/spark/scheduler/TaskSchedulerImpl.scala +++ b/core/src/main/scala/org/apache/spark/scheduler/TaskSchedulerImpl.scala @@ -394,9 +394,6 @@ private[spark] class TaskSchedulerImpl( taskResultGetter.stop() } starvationTimer.cancel() - - // sleeping for an arbitrary 1 seconds to ensure that messages are sent out. - Thread.sleep(1000L) } override def defaultParallelism() = backend.defaultParallelism() --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
