Skip to content

Commit

Permalink
Merge pull request apache#323 from nishchal-venkataramana/pie-spark-2…
Browse files Browse the repository at this point in the history 
….3.2

Use Utils.localHostName() for bindAddress
  • Loading branch information
Nishchal Venkataramana authored and GitHub Enterprise committed Mar 1, 2019
2 parents 63ea2d4 + 9cac893 commit 2e6b4b1
Show file tree
Hide file tree
Showing 39 changed files with 42 additions and 39 deletions.
2 changes: 1 addition & 1 deletion assembly/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>com.apple.pie.spark</groupId>
<artifactId>spark-parent_2.11</artifactId>
<version>2.3.2-pie1.0.1-SNAPSHOT</version>
<version>2.3.2-pie1.0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion common/kvstore/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>com.apple.pie.spark</groupId>
<artifactId>spark-parent_2.11</artifactId>
<version>2.3.2-pie1.0.1-SNAPSHOT</version>
<version>2.3.2-pie1.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion common/network-common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>com.apple.pie.spark</groupId>
<artifactId>spark-parent_2.11</artifactId>
<version>2.3.2-pie1.0.1-SNAPSHOT</version>
<version>2.3.2-pie1.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion common/network-shuffle/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>com.apple.pie.spark</groupId>
<artifactId>spark-parent_2.11</artifactId>
<version>2.3.2-pie1.0.1-SNAPSHOT</version>
<version>2.3.2-pie1.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion common/network-yarn/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>com.apple.pie.spark</groupId>
<artifactId>spark-parent_2.11</artifactId>
<version>2.3.2-pie1.0.1-SNAPSHOT</version>
<version>2.3.2-pie1.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion common/sketch/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>com.apple.pie.spark</groupId>
<artifactId>spark-parent_2.11</artifactId>
<version>2.3.2-pie1.0.1-SNAPSHOT</version>
<version>2.3.2-pie1.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion common/tags/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>com.apple.pie.spark</groupId>
<artifactId>spark-parent_2.11</artifactId>
<version>2.3.2-pie1.0.1-SNAPSHOT</version>
<version>2.3.2-pie1.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion common/unsafe/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>com.apple.pie.spark</groupId>
<artifactId>spark-parent_2.11</artifactId>
<version>2.3.2-pie1.0.1-SNAPSHOT</version>
<version>2.3.2-pie1.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>com.apple.pie.spark</groupId>
<artifactId>spark-parent_2.11</artifactId>
<version>2.3.2-pie1.0.1-SNAPSHOT</version>
<version>2.3.2-pie1.0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
5 changes: 4 additions & 1 deletion core/src/main/scala/org/apache/spark/executor/CoarseGrainedExecutorBackend.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ private[spark] object CoarseGrainedExecutorBackend extends Logging {
def main(args: Array[String]) {
var driverUrl: String = null
var executorId: String = null
var bindAddress: String = null
var bindAddress: String = Utils.localHostName()
var hostname: String = null
var cores: Int = 0
var appId: String = null
Expand Down Expand Up @@ -302,6 +302,9 @@ private[spark] object CoarseGrainedExecutorBackend extends Logging {
bindAddress = hostname
}

logInfo("SPARK_LOCAL_HOSTNAME set to " + sys.env.get("SPARK_LOCAL_HOSTNAME"))
logInfo("Using bindAddress: " + bindAddress)

run(driverUrl, executorId, bindAddress, hostname, cores, appId, workerUrl, userClassPath)
System.exit(0)
}
Expand Down
2 changes: 1 addition & 1 deletion examples/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>com.apple.pie.spark</groupId>
<artifactId>spark-parent_2.11</artifactId>
<version>2.3.2-pie1.0.1-SNAPSHOT</version>
<version>2.3.2-pie1.0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion external/docker-integration-tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>com.apple.pie.spark</groupId>
<artifactId>spark-parent_2.11</artifactId>
<version>2.3.2-pie1.0.1-SNAPSHOT</version>
<version>2.3.2-pie1.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion external/flume-assembly/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>com.apple.pie.spark</groupId>
<artifactId>spark-parent_2.11</artifactId>
<version>2.3.2-pie1.0.1-SNAPSHOT</version>
<version>2.3.2-pie1.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion external/flume-sink/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>com.apple.pie.spark</groupId>
<artifactId>spark-parent_2.11</artifactId>
<version>2.3.2-pie1.0.1-SNAPSHOT</version>
<version>2.3.2-pie1.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion external/flume/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>com.apple.pie.spark</groupId>
<artifactId>spark-parent_2.11</artifactId>
<version>2.3.2-pie1.0.1-SNAPSHOT</version>
<version>2.3.2-pie1.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion external/kafka-0-10-assembly/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>com.apple.pie.spark</groupId>
<artifactId>spark-parent_2.11</artifactId>
<version>2.3.2-pie1.0.1-SNAPSHOT</version>
<version>2.3.2-pie1.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion external/kafka-0-10-sql/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>com.apple.pie.spark</groupId>
<artifactId>spark-parent_2.11</artifactId>
<version>2.3.2-pie1.0.1-SNAPSHOT</version>
<version>2.3.2-pie1.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion external/kafka-0-10/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>com.apple.pie.spark</groupId>
<artifactId>spark-parent_2.11</artifactId>
<version>2.3.2-pie1.0.1-SNAPSHOT</version>
<version>2.3.2-pie1.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion external/kafka-0-8-assembly/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>com.apple.pie.spark</groupId>
<artifactId>spark-parent_2.11</artifactId>
<version>2.3.2-pie1.0.1-SNAPSHOT</version>
<version>2.3.2-pie1.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion external/kafka-0-8/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>com.apple.pie.spark</groupId>
<artifactId>spark-parent_2.11</artifactId>
<version>2.3.2-pie1.0.1-SNAPSHOT</version>
<version>2.3.2-pie1.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion external/kinesis-asl-assembly/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>com.apple.pie.spark</groupId>
<artifactId>spark-parent_2.11</artifactId>
<version>2.3.2-pie1.0.1-SNAPSHOT</version>
<version>2.3.2-pie1.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion external/kinesis-asl/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>com.apple.pie.spark</groupId>
<artifactId>spark-parent_2.11</artifactId>
<version>2.3.2-pie1.0.1-SNAPSHOT</version>
<version>2.3.2-pie1.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion external/spark-ganglia-lgpl/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>com.apple.pie.spark</groupId>
<artifactId>spark-parent_2.11</artifactId>
<version>2.3.2-pie1.0.1-SNAPSHOT</version>
<version>2.3.2-pie1.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion graphx/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>com.apple.pie.spark</groupId>
<artifactId>spark-parent_2.11</artifactId>
<version>2.3.2-pie1.0.1-SNAPSHOT</version>
<version>2.3.2-pie1.0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion hadoop-cloud/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>com.apple.pie.spark</groupId>
<artifactId>spark-parent_2.11</artifactId>
<version>2.3.2-pie1.0.1-SNAPSHOT</version>
<version>2.3.2-pie1.0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion launcher/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>com.apple.pie.spark</groupId>
<artifactId>spark-parent_2.11</artifactId>
<version>2.3.2-pie1.0.1-SNAPSHOT</version>
<version>2.3.2-pie1.0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion mllib-local/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>com.apple.pie.spark</groupId>
<artifactId>spark-parent_2.11</artifactId>
<version>2.3.2-pie1.0.1-SNAPSHOT</version>
<version>2.3.2-pie1.0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion mllib/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>com.apple.pie.spark</groupId>
<artifactId>spark-parent_2.11</artifactId>
<version>2.3.2-pie1.0.1-SNAPSHOT</version>
<version>2.3.2-pie1.0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
</parent>
<groupId>com.apple.pie.spark</groupId>
<artifactId>spark-parent_2.11</artifactId>
<version>2.3.2-pie1.0.1-SNAPSHOT</version>
<version>2.3.2-pie1.0.2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Spark Project Parent POM</name>
<url>http://spark.apache.org/</url>
Expand Down
2 changes: 1 addition & 1 deletion repl/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>com.apple.pie.spark</groupId>
<artifactId>spark-parent_2.11</artifactId>
<version>2.3.2-pie1.0.1-SNAPSHOT</version>
<version>2.3.2-pie1.0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion resource-managers/kubernetes/core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>com.apple.pie.spark</groupId>
<artifactId>spark-parent_2.11</artifactId>
<version>2.3.2-pie1.0.1-SNAPSHOT</version>
<version>2.3.2-pie1.0.2-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion resource-managers/mesos/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>com.apple.pie.spark</groupId>
<artifactId>spark-parent_2.11</artifactId>
<version>2.3.2-pie1.0.1-SNAPSHOT</version>
<version>2.3.2-pie1.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion resource-managers/yarn/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>com.apple.pie.spark</groupId>
<artifactId>spark-parent_2.11</artifactId>
<version>2.3.2-pie1.0.1-SNAPSHOT</version>
<version>2.3.2-pie1.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion sql/catalyst/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>com.apple.pie.spark</groupId>
<artifactId>spark-parent_2.11</artifactId>
<version>2.3.2-pie1.0.1-SNAPSHOT</version>
<version>2.3.2-pie1.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion sql/core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>com.apple.pie.spark</groupId>
<artifactId>spark-parent_2.11</artifactId>
<version>2.3.2-pie1.0.1-SNAPSHOT</version>
<version>2.3.2-pie1.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion sql/hive-thriftserver/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>com.apple.pie.spark</groupId>
<artifactId>spark-parent_2.11</artifactId>
<version>2.3.2-pie1.0.1-SNAPSHOT</version>
<version>2.3.2-pie1.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion sql/hive/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>com.apple.pie.spark</groupId>
<artifactId>spark-parent_2.11</artifactId>
<version>2.3.2-pie1.0.1-SNAPSHOT</version>
<version>2.3.2-pie1.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion streaming/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>com.apple.pie.spark</groupId>
<artifactId>spark-parent_2.11</artifactId>
<version>2.3.2-pie1.0.1-SNAPSHOT</version>
<version>2.3.2-pie1.0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion tools/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>com.apple.pie.spark</groupId>
<artifactId>spark-parent_2.11</artifactId>
<version>2.3.2-pie1.0.1-SNAPSHOT</version>
<version>2.3.2-pie1.0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down

0 comments on commit 2e6b4b1

Please sign in to comment.