Return-Path: X-Original-To: apmail-spark-commits-archive@minotaur.apache.org Delivered-To: apmail-spark-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id AFB34101C9 for ; Mon, 4 Nov 2013 07:44:18 +0000 (UTC) Received: (qmail 24952 invoked by uid 500); 4 Nov 2013 07:44:18 -0000 Delivered-To: apmail-spark-commits-archive@spark.apache.org Received: (qmail 24942 invoked by uid 500); 4 Nov 2013 07:44:18 -0000 Mailing-List: contact commits-help@spark.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@spark.incubator.apache.org Delivered-To: mailing list commits@spark.incubator.apache.org Received: (qmail 24935 invoked by uid 99); 4 Nov 2013 07:44:17 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 Nov 2013 07:44:17 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Mon, 04 Nov 2013 07:44:16 +0000 Received: (qmail 24750 invoked by uid 99); 4 Nov 2013 07:43:56 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 Nov 2013 07:43:56 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 6B73D3A356; Mon, 4 Nov 2013 07:43:56 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: rxin@apache.org To: commits@spark.incubator.apache.org Message-Id: <7e8f2026de5e4c5abcdfb45e52a095e2@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: Merge pull request #126 from kayousterhout/local_fix Date: Mon, 4 Nov 2013 07:43:56 +0000 (UTC) X-Virus-Checked: Checked by ClamAV on apache.org Updated Branches: refs/heads/branch-0.8 504fe7465 -> ba0e8584a Merge pull request #126 from kayousterhout/local_fix Fixed incorrect log message in local scheduler This change is especially relevant at the moment, because some users are seeing this failure, and the log message is misleading/incorrect (because for the tests, the max failures is set to 0, not 4) (cherry picked from commit dc9ce16f6b695295c24062a76fd10f574d278cac) Signed-off-by: Reynold Xin Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/ba0e8584 Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/ba0e8584 Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/ba0e8584 Branch: refs/heads/branch-0.8 Commit: ba0e8584a2d6e2d12fe63ec3aefdc2ba8b13818a Parents: 504fe74 Author: Matei Zaharia Authored: Wed Oct 30 17:01:56 2013 -0700 Committer: Reynold Xin Committed: Sun Nov 3 23:43:48 2013 -0800 ---------------------------------------------------------------------- .../org/apache/spark/scheduler/local/LocalTaskSetManager.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/ba0e8584/core/src/main/scala/org/apache/spark/scheduler/local/LocalTaskSetManager.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/spark/scheduler/local/LocalTaskSetManager.scala b/core/src/main/scala/org/apache/spark/scheduler/local/LocalTaskSetManager.scala index 55f8313..53bf782 100644 --- a/core/src/main/scala/org/apache/spark/scheduler/local/LocalTaskSetManager.scala +++ b/core/src/main/scala/org/apache/spark/scheduler/local/LocalTaskSetManager.scala @@ -175,7 +175,7 @@ private[spark] class LocalTaskSetManager(sched: LocalScheduler, val taskSet: Tas reason.className, reason.description, locs.mkString("\n"))) if (numFailures(index) > MAX_TASK_FAILURES) { val errorMessage = "Task %s:%d failed more than %d times; aborting job %s".format( - taskSet.id, index, 4, reason.description) + taskSet.id, index, MAX_TASK_FAILURES, reason.description) decreaseRunningTasks(runningTasks) sched.dagScheduler.taskSetFailed(taskSet, errorMessage) // need to delete failed Taskset from schedule queue