Fix build for Hadoop 1.x

Author: Andrew Or

pom.xml

@@ -93,7 +93,6 @@
     <module>tools</module>
     <module>network/common</module>
     <module>network/shuffle</module>
-    <module>network/yarn</module>
     <module>streaming</module>
     <module>sql/catalyst</module>
     <module>sql/core</module>
@@ -1230,13 +1229,15 @@
       <id>yarn-alpha</id>
       <modules>
         <module>yarn</module>
+        <module>network/yarn</module>
       </modules>
     </profile>
 
     <profile>
       <id>yarn</id>
       <modules>
         <module>yarn</module>
+        <module>network/yarn</module>
       </modules>
     </profile>
 

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

@@ -90,6 +90,12 @@ class ExecutorRunnable(
 
     ctx.setApplicationACLs(YarnSparkHadoopUtil.getApplicationAclsForYarn(securityMgr))
 
+    // If external shuffle service is enabled, register with the
+    // Yarn shuffle service already started on the node manager
+    if (sparkConf.getBoolean("spark.shuffle.service.enabled", false)) {
+      ctx.setServiceData(Map[String, ByteBuffer]("spark_shuffle" -> ByteBuffer.allocate(0)))
+    }
+
     // Send the start request to the ContainerManager
     val startReq = Records.newRecord(classOf[StartContainerRequest])
     .asInstanceOf[StartContainerRequest]