Skip to content

Commit 15a5b37

Browse files
author
Andrew Or
committed
Fix build for Hadoop 1.x
1 parent baff916 commit 15a5b37

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@
9393
<module>tools</module>
9494
<module>network/common</module>
9595
<module>network/shuffle</module>
96-
<module>network/yarn</module>
9796
<module>streaming</module>
9897
<module>sql/catalyst</module>
9998
<module>sql/core</module>
@@ -1230,13 +1229,15 @@
12301229
<id>yarn-alpha</id>
12311230
<modules>
12321231
<module>yarn</module>
1232+
<module>network/yarn</module>
12331233
</modules>
12341234
</profile>
12351235

12361236
<profile>
12371237
<id>yarn</id>
12381238
<modules>
12391239
<module>yarn</module>
1240+
<module>network/yarn</module>
12401241
</modules>
12411242
</profile>
12421243

yarn/alpha/src/main/scala/org/apache/spark/deploy/yarn/ExecutorRunnable.scala

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,12 @@ class ExecutorRunnable(
9090

9191
ctx.setApplicationACLs(YarnSparkHadoopUtil.getApplicationAclsForYarn(securityMgr))
9292

93+
// If external shuffle service is enabled, register with the
94+
// Yarn shuffle service already started on the node manager
95+
if (sparkConf.getBoolean("spark.shuffle.service.enabled", false)) {
96+
ctx.setServiceData(Map[String, ByteBuffer]("spark_shuffle" -> ByteBuffer.allocate(0)))
97+
}
98+
9399
// Send the start request to the ContainerManager
94100
val startReq = Records.newRecord(classOf[StartContainerRequest])
95101
.asInstanceOf[StartContainerRequest]

0 commit comments

Comments
 (0)