From 9cac89310c0b111c6746a2442b0aa7e24c710dd9 Mon Sep 17 00:00:00 2001 From: nishchal Date: Fri, 1 Mar 2019 11:06:27 -0800 Subject: [PATCH] Use Utils.localHostName() for bindAddress --- assembly/pom.xml | 2 +- common/kvstore/pom.xml | 2 +- common/network-common/pom.xml | 2 +- common/network-shuffle/pom.xml | 2 +- common/network-yarn/pom.xml | 2 +- common/sketch/pom.xml | 2 +- common/tags/pom.xml | 2 +- common/unsafe/pom.xml | 2 +- core/pom.xml | 2 +- .../apache/spark/executor/CoarseGrainedExecutorBackend.scala | 5 ++++- examples/pom.xml | 2 +- external/docker-integration-tests/pom.xml | 2 +- external/flume-assembly/pom.xml | 2 +- external/flume-sink/pom.xml | 2 +- external/flume/pom.xml | 2 +- external/kafka-0-10-assembly/pom.xml | 2 +- external/kafka-0-10-sql/pom.xml | 2 +- external/kafka-0-10/pom.xml | 2 +- external/kafka-0-8-assembly/pom.xml | 2 +- external/kafka-0-8/pom.xml | 2 +- external/kinesis-asl-assembly/pom.xml | 2 +- external/kinesis-asl/pom.xml | 2 +- external/spark-ganglia-lgpl/pom.xml | 2 +- graphx/pom.xml | 2 +- hadoop-cloud/pom.xml | 2 +- launcher/pom.xml | 2 +- mllib-local/pom.xml | 2 +- mllib/pom.xml | 2 +- pom.xml | 2 +- repl/pom.xml | 2 +- resource-managers/kubernetes/core/pom.xml | 2 +- resource-managers/mesos/pom.xml | 2 +- resource-managers/yarn/pom.xml | 2 +- sql/catalyst/pom.xml | 2 +- sql/core/pom.xml | 2 +- sql/hive-thriftserver/pom.xml | 2 +- sql/hive/pom.xml | 2 +- streaming/pom.xml | 2 +- tools/pom.xml | 2 +- 39 files changed, 42 insertions(+), 39 deletions(-) diff --git a/assembly/pom.xml b/assembly/pom.xml index 59ed779e69dbd..ce16e43868ce0 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -21,7 +21,7 @@ com.apple.pie.spark spark-parent_2.11 - 2.3.2-pie1.0.1-SNAPSHOT + 2.3.2-pie1.0.2-SNAPSHOT ../pom.xml diff --git a/common/kvstore/pom.xml b/common/kvstore/pom.xml index 3111b48c36742..f82edc1251078 100644 --- a/common/kvstore/pom.xml +++ b/common/kvstore/pom.xml @@ -22,7 +22,7 @@ com.apple.pie.spark spark-parent_2.11 - 2.3.2-pie1.0.1-SNAPSHOT + 2.3.2-pie1.0.2-SNAPSHOT ../../pom.xml diff --git a/common/network-common/pom.xml b/common/network-common/pom.xml index 7fe9643ec4d07..393fe7dc59a0b 100644 --- a/common/network-common/pom.xml +++ b/common/network-common/pom.xml @@ -22,7 +22,7 @@ com.apple.pie.spark spark-parent_2.11 - 2.3.2-pie1.0.1-SNAPSHOT + 2.3.2-pie1.0.2-SNAPSHOT ../../pom.xml diff --git a/common/network-shuffle/pom.xml b/common/network-shuffle/pom.xml index 045c6871165fb..c3c09983e0bce 100644 --- a/common/network-shuffle/pom.xml +++ b/common/network-shuffle/pom.xml @@ -22,7 +22,7 @@ com.apple.pie.spark spark-parent_2.11 - 2.3.2-pie1.0.1-SNAPSHOT + 2.3.2-pie1.0.2-SNAPSHOT ../../pom.xml diff --git a/common/network-yarn/pom.xml b/common/network-yarn/pom.xml index b39787019f118..92c5924f63975 100644 --- a/common/network-yarn/pom.xml +++ b/common/network-yarn/pom.xml @@ -22,7 +22,7 @@ com.apple.pie.spark spark-parent_2.11 - 2.3.2-pie1.0.1-SNAPSHOT + 2.3.2-pie1.0.2-SNAPSHOT ../../pom.xml diff --git a/common/sketch/pom.xml b/common/sketch/pom.xml index c4d4a001bc10d..a8cb3f4f28d6f 100644 --- a/common/sketch/pom.xml +++ b/common/sketch/pom.xml @@ -22,7 +22,7 @@ com.apple.pie.spark spark-parent_2.11 - 2.3.2-pie1.0.1-SNAPSHOT + 2.3.2-pie1.0.2-SNAPSHOT ../../pom.xml diff --git a/common/tags/pom.xml b/common/tags/pom.xml index bacc3a4441263..6ef170b36ac96 100644 --- a/common/tags/pom.xml +++ b/common/tags/pom.xml @@ -22,7 +22,7 @@ com.apple.pie.spark spark-parent_2.11 - 2.3.2-pie1.0.1-SNAPSHOT + 2.3.2-pie1.0.2-SNAPSHOT ../../pom.xml diff --git a/common/unsafe/pom.xml b/common/unsafe/pom.xml index b5bf78e0c4d33..929496176576a 100644 --- a/common/unsafe/pom.xml +++ b/common/unsafe/pom.xml @@ -22,7 +22,7 @@ com.apple.pie.spark spark-parent_2.11 - 2.3.2-pie1.0.1-SNAPSHOT + 2.3.2-pie1.0.2-SNAPSHOT ../../pom.xml diff --git a/core/pom.xml b/core/pom.xml index 5b560f3cf7ccb..739cce6c63332 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -21,7 +21,7 @@ com.apple.pie.spark spark-parent_2.11 - 2.3.2-pie1.0.1-SNAPSHOT + 2.3.2-pie1.0.2-SNAPSHOT ../pom.xml diff --git a/core/src/main/scala/org/apache/spark/executor/CoarseGrainedExecutorBackend.scala b/core/src/main/scala/org/apache/spark/executor/CoarseGrainedExecutorBackend.scala index 72235feee6a24..6901b1a6e8c63 100644 --- a/core/src/main/scala/org/apache/spark/executor/CoarseGrainedExecutorBackend.scala +++ b/core/src/main/scala/org/apache/spark/executor/CoarseGrainedExecutorBackend.scala @@ -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 @@ -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) } diff --git a/examples/pom.xml b/examples/pom.xml index 122b03c860c0e..11b35fa0bd1bb 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -21,7 +21,7 @@ com.apple.pie.spark spark-parent_2.11 - 2.3.2-pie1.0.1-SNAPSHOT + 2.3.2-pie1.0.2-SNAPSHOT ../pom.xml diff --git a/external/docker-integration-tests/pom.xml b/external/docker-integration-tests/pom.xml index e3117173edb8d..90fa3a2bad6d3 100644 --- a/external/docker-integration-tests/pom.xml +++ b/external/docker-integration-tests/pom.xml @@ -22,7 +22,7 @@ com.apple.pie.spark spark-parent_2.11 - 2.3.2-pie1.0.1-SNAPSHOT + 2.3.2-pie1.0.2-SNAPSHOT ../../pom.xml diff --git a/external/flume-assembly/pom.xml b/external/flume-assembly/pom.xml index cf81bc0c7ce71..e702474ded326 100644 --- a/external/flume-assembly/pom.xml +++ b/external/flume-assembly/pom.xml @@ -21,7 +21,7 @@ com.apple.pie.spark spark-parent_2.11 - 2.3.2-pie1.0.1-SNAPSHOT + 2.3.2-pie1.0.2-SNAPSHOT ../../pom.xml diff --git a/external/flume-sink/pom.xml b/external/flume-sink/pom.xml index f3a80ac162429..2e62fa8f26ed2 100644 --- a/external/flume-sink/pom.xml +++ b/external/flume-sink/pom.xml @@ -21,7 +21,7 @@ com.apple.pie.spark spark-parent_2.11 - 2.3.2-pie1.0.1-SNAPSHOT + 2.3.2-pie1.0.2-SNAPSHOT ../../pom.xml diff --git a/external/flume/pom.xml b/external/flume/pom.xml index 08f0993267029..62585172fd1ed 100644 --- a/external/flume/pom.xml +++ b/external/flume/pom.xml @@ -21,7 +21,7 @@ com.apple.pie.spark spark-parent_2.11 - 2.3.2-pie1.0.1-SNAPSHOT + 2.3.2-pie1.0.2-SNAPSHOT ../../pom.xml diff --git a/external/kafka-0-10-assembly/pom.xml b/external/kafka-0-10-assembly/pom.xml index 5950d9adc9ae0..22f11f6e335ae 100644 --- a/external/kafka-0-10-assembly/pom.xml +++ b/external/kafka-0-10-assembly/pom.xml @@ -21,7 +21,7 @@ com.apple.pie.spark spark-parent_2.11 - 2.3.2-pie1.0.1-SNAPSHOT + 2.3.2-pie1.0.2-SNAPSHOT ../../pom.xml diff --git a/external/kafka-0-10-sql/pom.xml b/external/kafka-0-10-sql/pom.xml index 620ef38fccbb4..51accb18eba64 100644 --- a/external/kafka-0-10-sql/pom.xml +++ b/external/kafka-0-10-sql/pom.xml @@ -21,7 +21,7 @@ com.apple.pie.spark spark-parent_2.11 - 2.3.2-pie1.0.1-SNAPSHOT + 2.3.2-pie1.0.2-SNAPSHOT ../../pom.xml diff --git a/external/kafka-0-10/pom.xml b/external/kafka-0-10/pom.xml index a81624b487060..475aba0ffcc7b 100644 --- a/external/kafka-0-10/pom.xml +++ b/external/kafka-0-10/pom.xml @@ -21,7 +21,7 @@ com.apple.pie.spark spark-parent_2.11 - 2.3.2-pie1.0.1-SNAPSHOT + 2.3.2-pie1.0.2-SNAPSHOT ../../pom.xml diff --git a/external/kafka-0-8-assembly/pom.xml b/external/kafka-0-8-assembly/pom.xml index b33899684db23..26807e2d98374 100644 --- a/external/kafka-0-8-assembly/pom.xml +++ b/external/kafka-0-8-assembly/pom.xml @@ -21,7 +21,7 @@ com.apple.pie.spark spark-parent_2.11 - 2.3.2-pie1.0.1-SNAPSHOT + 2.3.2-pie1.0.2-SNAPSHOT ../../pom.xml diff --git a/external/kafka-0-8/pom.xml b/external/kafka-0-8/pom.xml index 87517e461a20e..60cf72cc5edf6 100644 --- a/external/kafka-0-8/pom.xml +++ b/external/kafka-0-8/pom.xml @@ -21,7 +21,7 @@ com.apple.pie.spark spark-parent_2.11 - 2.3.2-pie1.0.1-SNAPSHOT + 2.3.2-pie1.0.2-SNAPSHOT ../../pom.xml diff --git a/external/kinesis-asl-assembly/pom.xml b/external/kinesis-asl-assembly/pom.xml index 9ba00dd79de6b..da47ed3bf33d2 100644 --- a/external/kinesis-asl-assembly/pom.xml +++ b/external/kinesis-asl-assembly/pom.xml @@ -21,7 +21,7 @@ com.apple.pie.spark spark-parent_2.11 - 2.3.2-pie1.0.1-SNAPSHOT + 2.3.2-pie1.0.2-SNAPSHOT ../../pom.xml diff --git a/external/kinesis-asl/pom.xml b/external/kinesis-asl/pom.xml index ab9fd3c494a3b..6f89e2e658b2d 100644 --- a/external/kinesis-asl/pom.xml +++ b/external/kinesis-asl/pom.xml @@ -20,7 +20,7 @@ com.apple.pie.spark spark-parent_2.11 - 2.3.2-pie1.0.1-SNAPSHOT + 2.3.2-pie1.0.2-SNAPSHOT ../../pom.xml diff --git a/external/spark-ganglia-lgpl/pom.xml b/external/spark-ganglia-lgpl/pom.xml index a898f5e7a939f..dc359373b6eaa 100644 --- a/external/spark-ganglia-lgpl/pom.xml +++ b/external/spark-ganglia-lgpl/pom.xml @@ -20,7 +20,7 @@ com.apple.pie.spark spark-parent_2.11 - 2.3.2-pie1.0.1-SNAPSHOT + 2.3.2-pie1.0.2-SNAPSHOT ../../pom.xml diff --git a/graphx/pom.xml b/graphx/pom.xml index 7da65596e32c3..f0ebd0bee7c5d 100644 --- a/graphx/pom.xml +++ b/graphx/pom.xml @@ -21,7 +21,7 @@ com.apple.pie.spark spark-parent_2.11 - 2.3.2-pie1.0.1-SNAPSHOT + 2.3.2-pie1.0.2-SNAPSHOT ../pom.xml diff --git a/hadoop-cloud/pom.xml b/hadoop-cloud/pom.xml index e0636e1f25482..e812a17b6da9a 100644 --- a/hadoop-cloud/pom.xml +++ b/hadoop-cloud/pom.xml @@ -22,7 +22,7 @@ com.apple.pie.spark spark-parent_2.11 - 2.3.2-pie1.0.1-SNAPSHOT + 2.3.2-pie1.0.2-SNAPSHOT ../pom.xml diff --git a/launcher/pom.xml b/launcher/pom.xml index 3309303bfdb1a..de67ae9aa6fcb 100644 --- a/launcher/pom.xml +++ b/launcher/pom.xml @@ -22,7 +22,7 @@ com.apple.pie.spark spark-parent_2.11 - 2.3.2-pie1.0.1-SNAPSHOT + 2.3.2-pie1.0.2-SNAPSHOT ../pom.xml diff --git a/mllib-local/pom.xml b/mllib-local/pom.xml index 2c2fd21533cbc..a20ed9be5dbcb 100644 --- a/mllib-local/pom.xml +++ b/mllib-local/pom.xml @@ -21,7 +21,7 @@ com.apple.pie.spark spark-parent_2.11 - 2.3.2-pie1.0.1-SNAPSHOT + 2.3.2-pie1.0.2-SNAPSHOT ../pom.xml diff --git a/mllib/pom.xml b/mllib/pom.xml index b5e45f2cbc745..1dc8015d4c633 100644 --- a/mllib/pom.xml +++ b/mllib/pom.xml @@ -21,7 +21,7 @@ com.apple.pie.spark spark-parent_2.11 - 2.3.2-pie1.0.1-SNAPSHOT + 2.3.2-pie1.0.2-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index 947cd0b67c4ea..c4e61ba9fcb68 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ com.apple.pie.spark spark-parent_2.11 - 2.3.2-pie1.0.1-SNAPSHOT + 2.3.2-pie1.0.2-SNAPSHOT pom Spark Project Parent POM http://spark.apache.org/ diff --git a/repl/pom.xml b/repl/pom.xml index e4dc9d84b6d53..d0f1bf7cf1954 100644 --- a/repl/pom.xml +++ b/repl/pom.xml @@ -21,7 +21,7 @@ com.apple.pie.spark spark-parent_2.11 - 2.3.2-pie1.0.1-SNAPSHOT + 2.3.2-pie1.0.2-SNAPSHOT ../pom.xml diff --git a/resource-managers/kubernetes/core/pom.xml b/resource-managers/kubernetes/core/pom.xml index 3ee7e10a3da26..417eedc2f7e6b 100644 --- a/resource-managers/kubernetes/core/pom.xml +++ b/resource-managers/kubernetes/core/pom.xml @@ -20,7 +20,7 @@ com.apple.pie.spark spark-parent_2.11 - 2.3.2-pie1.0.1-SNAPSHOT + 2.3.2-pie1.0.2-SNAPSHOT ../../../pom.xml diff --git a/resource-managers/mesos/pom.xml b/resource-managers/mesos/pom.xml index b2acb633259e8..3b367bf0a8f89 100644 --- a/resource-managers/mesos/pom.xml +++ b/resource-managers/mesos/pom.xml @@ -20,7 +20,7 @@ com.apple.pie.spark spark-parent_2.11 - 2.3.2-pie1.0.1-SNAPSHOT + 2.3.2-pie1.0.2-SNAPSHOT ../../pom.xml diff --git a/resource-managers/yarn/pom.xml b/resource-managers/yarn/pom.xml index 90b807472edf3..d423f2b70426a 100644 --- a/resource-managers/yarn/pom.xml +++ b/resource-managers/yarn/pom.xml @@ -20,7 +20,7 @@ com.apple.pie.spark spark-parent_2.11 - 2.3.2-pie1.0.1-SNAPSHOT + 2.3.2-pie1.0.2-SNAPSHOT ../../pom.xml diff --git a/sql/catalyst/pom.xml b/sql/catalyst/pom.xml index 8761b0560601b..258dbec0d751d 100644 --- a/sql/catalyst/pom.xml +++ b/sql/catalyst/pom.xml @@ -22,7 +22,7 @@ com.apple.pie.spark spark-parent_2.11 - 2.3.2-pie1.0.1-SNAPSHOT + 2.3.2-pie1.0.2-SNAPSHOT ../../pom.xml diff --git a/sql/core/pom.xml b/sql/core/pom.xml index ed92a51a212e6..faf75d9eb6d5d 100644 --- a/sql/core/pom.xml +++ b/sql/core/pom.xml @@ -22,7 +22,7 @@ com.apple.pie.spark spark-parent_2.11 - 2.3.2-pie1.0.1-SNAPSHOT + 2.3.2-pie1.0.2-SNAPSHOT ../../pom.xml diff --git a/sql/hive-thriftserver/pom.xml b/sql/hive-thriftserver/pom.xml index 01ff4c091a9f2..18fb53632d165 100644 --- a/sql/hive-thriftserver/pom.xml +++ b/sql/hive-thriftserver/pom.xml @@ -22,7 +22,7 @@ com.apple.pie.spark spark-parent_2.11 - 2.3.2-pie1.0.1-SNAPSHOT + 2.3.2-pie1.0.2-SNAPSHOT ../../pom.xml diff --git a/sql/hive/pom.xml b/sql/hive/pom.xml index c430f9049f22d..933e4a70dde58 100644 --- a/sql/hive/pom.xml +++ b/sql/hive/pom.xml @@ -22,7 +22,7 @@ com.apple.pie.spark spark-parent_2.11 - 2.3.2-pie1.0.1-SNAPSHOT + 2.3.2-pie1.0.2-SNAPSHOT ../../pom.xml diff --git a/streaming/pom.xml b/streaming/pom.xml index a7687411913d7..d2c6624299b0c 100644 --- a/streaming/pom.xml +++ b/streaming/pom.xml @@ -21,7 +21,7 @@ com.apple.pie.spark spark-parent_2.11 - 2.3.2-pie1.0.1-SNAPSHOT + 2.3.2-pie1.0.2-SNAPSHOT ../pom.xml diff --git a/tools/pom.xml b/tools/pom.xml index 6bbe52cc0797e..948972211220a 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -20,7 +20,7 @@ com.apple.pie.spark spark-parent_2.11 - 2.3.2-pie1.0.1-SNAPSHOT + 2.3.2-pie1.0.2-SNAPSHOT ../pom.xml