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 6169610E60 for ; Sun, 24 Nov 2013 23:51:23 +0000 (UTC) Received: (qmail 22188 invoked by uid 500); 24 Nov 2013 23:51:23 -0000 Delivered-To: apmail-spark-commits-archive@spark.apache.org Received: (qmail 22146 invoked by uid 500); 24 Nov 2013 23:51:23 -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 22139 invoked by uid 99); 24 Nov 2013 23:51:23 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 24 Nov 2013 23:51:23 +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; Sun, 24 Nov 2013 23:51:21 +0000 Received: (qmail 22045 invoked by uid 99); 24 Nov 2013 23:50:59 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 24 Nov 2013 23:50:59 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 5D4219047AE; Sun, 24 Nov 2013 23:50:59 +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 Date: Sun, 24 Nov 2013 23:51:00 -0000 Message-Id: In-Reply-To: <7f7df32a90da4817841a7f0e075d70b7@git.apache.org> References: <7f7df32a90da4817841a7f0e075d70b7@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: Merge pull request #197 from aarondav/patrick-fix X-Virus-Checked: Checked by ClamAV on apache.org Merge pull request #197 from aarondav/patrick-fix Fix 'timeWriting' stat for shuffle files Due to concurrent git branches, changes from shuffle file consolidation patch caused the shuffle write timing patch to no longer actually measure the time, since it requires time be measured after the stream has been closed. Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/972171b9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/972171b9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/972171b9 Branch: refs/heads/master Commit: 972171b9d93b07e8511a2da3a33f897ba033484b Parents: 718cc80 ccea38b Author: Reynold Xin Authored: Mon Nov 25 07:50:46 2013 +0800 Committer: Reynold Xin Committed: Mon Nov 25 07:50:46 2013 +0800 ---------------------------------------------------------------------- .../scala/org/apache/spark/scheduler/ShuffleMapTask.scala | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) ----------------------------------------------------------------------