You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by rx...@apache.org on 2016/12/15 23:36:52 UTC
spark git commit: [SPARK-8425][SCHEDULER][HOTFIX] fix scala 2.10
compile error
Repository: spark
Updated Branches:
refs/heads/master 0917c8ee0 -> 32ff96452
[SPARK-8425][SCHEDULER][HOTFIX] fix scala 2.10 compile error
## What changes were proposed in this pull request?
https://github.com/apache/spark/commit/93cdb8a7d0f124b4db069fd8242207c82e263c52 Introduced a compile error under scala 2.10, this fixes that error.
## How was this patch tested?
locally ran
```
dev/change-version-to-2.10.sh
build/sbt -Pyarn -Phadoop-2.4 -Dhadoop.version=2.6.0 -Dscala-2.10 "project yarn" "test-only *YarnAllocatorSuite"
```
(which failed at test compilation before this change)
Author: Imran Rashid <ir...@cloudera.com>
Closes #16298 from squito/blacklist-2.10.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/32ff9645
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/32ff9645
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/32ff9645
Branch: refs/heads/master
Commit: 32ff96452666376e68d4f12e7927267da6767f31
Parents: 0917c8e
Author: Imran Rashid <ir...@cloudera.com>
Authored: Thu Dec 15 15:36:48 2016 -0800
Committer: Reynold Xin <rx...@databricks.com>
Committed: Thu Dec 15 15:36:48 2016 -0800
----------------------------------------------------------------------
.../org/apache/spark/deploy/yarn/YarnAllocatorSuite.scala | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/32ff9645/resource-managers/yarn/src/test/scala/org/apache/spark/deploy/yarn/YarnAllocatorSuite.scala
----------------------------------------------------------------------
diff --git a/resource-managers/yarn/src/test/scala/org/apache/spark/deploy/yarn/YarnAllocatorSuite.scala b/resource-managers/yarn/src/test/scala/org/apache/spark/deploy/yarn/YarnAllocatorSuite.scala
index 331bad4..fcc0594 100644
--- a/resource-managers/yarn/src/test/scala/org/apache/spark/deploy/yarn/YarnAllocatorSuite.scala
+++ b/resource-managers/yarn/src/test/scala/org/apache/spark/deploy/yarn/YarnAllocatorSuite.scala
@@ -296,13 +296,13 @@ class YarnAllocatorSuite extends SparkFunSuite with Matchers with BeforeAndAfter
val mockAmClient = mock(classOf[AMRMClient[ContainerRequest]])
val handler = createAllocator(4, mockAmClient)
handler.requestTotalExecutorsWithPreferredLocalities(1, 0, Map(), Set("hostA"))
- verify(mockAmClient).updateBlacklist(Seq("hostA").asJava, Seq().asJava)
+ verify(mockAmClient).updateBlacklist(Seq("hostA").asJava, Seq[String]().asJava)
handler.requestTotalExecutorsWithPreferredLocalities(2, 0, Map(), Set("hostA", "hostB"))
- verify(mockAmClient).updateBlacklist(Seq("hostB").asJava, Seq().asJava)
+ verify(mockAmClient).updateBlacklist(Seq("hostB").asJava, Seq[String]().asJava)
handler.requestTotalExecutorsWithPreferredLocalities(3, 0, Map(), Set())
- verify(mockAmClient).updateBlacklist(Seq().asJava, Seq("hostA", "hostB").asJava)
+ verify(mockAmClient).updateBlacklist(Seq[String]().asJava, Seq("hostA", "hostB").asJava)
}
test("memory exceeded diagnostic regexes") {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org