From c86c9760374f331ab7ed173b0a022250635485d3 Mon Sep 17 00:00:00 2001
From: Andrew Or <andrewor14@gmail.com>
Date: Sun, 12 Oct 2014 15:41:27 -0700
Subject: [PATCH] [HOTFIX] Fix compilation error for Yarn 2.0.*-alpha
This was reported in https://issues.apache.org/jira/browse/SPARK-3445. There are API differences between the 0.23.* and the 2.0.*-alpha branches that are not accounted for when this code was introduced.
Author: Andrew Or <andrewor14@gmail.com>
Closes #2776 from andrewor14/fix-yarn-alpha and squashes the following commits:
ec94752 [Andrew Or] Fix compilation error for 2.0.*-alpha
---
.../src/main/scala/org/apache/spark/deploy/yarn/Client.scala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/yarn/alpha/src/main/scala/org/apache/spark/deploy/yarn/Client.scala b/yarn/alpha/src/main/scala/org/apache/spark/deploy/yarn/Client.scala
index 5a20532315..5c7bca4541 100644
--- a/yarn/alpha/src/main/scala/org/apache/spark/deploy/yarn/Client.scala
+++ b/yarn/alpha/src/main/scala/org/apache/spark/deploy/yarn/Client.scala
@@ -122,7 +122,7 @@ private[spark] class Client(
* ApplicationReport#getClientToken is renamed `getClientToAMToken` in the stable API.
*/
override def getClientToken(report: ApplicationReport): String =
- Option(report.getClientToken).getOrElse("")
+ Option(report.getClientToken).map(_.toString).getOrElse("")
}
object Client {
--
GitLab