diff options
| author | Imran Rashid <irashid@cloudera.com> | 2016-12-15 15:36:48 -0800 |
|---|---|---|
| committer | Reynold Xin <rxin@databricks.com> | 2016-12-15 15:36:48 -0800 |
| commit | 32ff96452666376e68d4f12e7927267da6767f31 (patch) | |
| tree | fde93e33e4b481e836204b1e759f844df17d3bdb | |
| parent | 0917c8ee07bd3de87d9754960d8e89808b5efb2f (diff) | |
| download | spark-32ff96452666376e68d4f12e7927267da6767f31.tar.gz spark-32ff96452666376e68d4f12e7927267da6767f31.tar.bz2 spark-32ff96452666376e68d4f12e7927267da6767f31.zip | |
[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 <irashid@cloudera.com>
Closes #16298 from squito/blacklist-2.10.
| -rw-r--r-- | resource-managers/yarn/src/test/scala/org/apache/spark/deploy/yarn/YarnAllocatorSuite.scala | 6 |
1 files changed, 3 insertions, 3 deletions
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 331bad4fd8..fcc0594cf6 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") { |