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 2BE3F17E52 for ; Wed, 8 Oct 2014 16:53:56 +0000 (UTC) Received: (qmail 5389 invoked by uid 500); 8 Oct 2014 16:53:56 -0000 Delivered-To: apmail-spark-commits-archive@spark.apache.org Received: (qmail 5359 invoked by uid 500); 8 Oct 2014 16:53:56 -0000 Mailing-List: contact commits-help@spark.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list commits@spark.apache.org Received: (qmail 5350 invoked by uid 99); 8 Oct 2014 16:53: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; Wed, 08 Oct 2014 16:53:56 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id B6F0192C214; Wed, 8 Oct 2014 16:53:55 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tgraves@apache.org To: commits@spark.apache.org Message-Id: <009eb8c398b44d93a6a2da50dede55b0@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: [SPARK-3848] yarn alpha doesn't build on master Date: Wed, 8 Oct 2014 16:53:55 +0000 (UTC) Repository: spark Updated Branches: refs/heads/master 7fca8f41c -> f18dd5962 [SPARK-3848] yarn alpha doesn't build on master yarn alpha build was broken by #2432 as it added an argument to YarnAllocator but not to yarn/alpha YarnAllocationHandler commit https://github.com/apache/spark/commit/79e45c9323455a51f25ed9acd0edd8682b4bbb88 Author: Kousuke Saruta Closes #2715 from sarutak/SPARK-3848 and squashes the following commits: bafb8d1 [Kousuke Saruta] Fixed parameters for the default constructor of alpha/YarnAllocatorHandler. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/f18dd596 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/f18dd596 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/f18dd596 Branch: refs/heads/master Commit: f18dd5962e4a18c3507de8147bde3a8f56380439 Parents: 7fca8f4 Author: Kousuke Saruta Authored: Wed Oct 8 11:53:43 2014 -0500 Committer: Thomas Graves Committed: Wed Oct 8 11:53:43 2014 -0500 ---------------------------------------------------------------------- .../scala/org/apache/spark/deploy/yarn/YarnAllocationHandler.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/f18dd596/yarn/alpha/src/main/scala/org/apache/spark/deploy/yarn/YarnAllocationHandler.scala ---------------------------------------------------------------------- diff --git a/yarn/alpha/src/main/scala/org/apache/spark/deploy/yarn/YarnAllocationHandler.scala b/yarn/alpha/src/main/scala/org/apache/spark/deploy/yarn/YarnAllocationHandler.scala index 6c93d85..abd3783 100644 --- a/yarn/alpha/src/main/scala/org/apache/spark/deploy/yarn/YarnAllocationHandler.scala +++ b/yarn/alpha/src/main/scala/org/apache/spark/deploy/yarn/YarnAllocationHandler.scala @@ -43,7 +43,7 @@ private[yarn] class YarnAllocationHandler( args: ApplicationMasterArguments, preferredNodes: collection.Map[String, collection.Set[SplitInfo]], securityMgr: SecurityManager) - extends YarnAllocator(conf, sparkConf, args, preferredNodes, securityMgr) { + extends YarnAllocator(conf, sparkConf, appAttemptId, args, preferredNodes, securityMgr) { private val lastResponseId = new AtomicInteger() private val releaseList: CopyOnWriteArrayList[ContainerId] = new CopyOnWriteArrayList() --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org For additional commands, e-mail: commits-help@spark.apache.org