From 625fdddacd58ad54fdbb17409987812176abc812 Mon Sep 17 00:00:00 2001
From: Erik O'Shaughnessy <erik.oshaughnessy@gmail.com>
Date: Sat, 22 Oct 2016 09:37:53 +0100
Subject: [PATCH] [SPARK-17944][DEPLOY] sbin/start-* scripts use of `hostname
-f` fail with Solaris
## What changes were proposed in this pull request?
Modify sbin/start-master.sh, sbin/start-mesos-dispatcher.sh and sbin/start-slaves.sh to use the output of 'uname' to select which OS-specific command-line is used to determine the host's fully qualified host name.
## How was this patch tested?
Tested by hand; starting on Solaris, Linux and macOS.
Author: Erik O'Shaughnessy <erik.oshaughnessy@gmail.com>
Closes #15557 from JnyJny/SPARK-17944.
---
sbin/start-master.sh | 9 ++++++++-
sbin/start-mesos-dispatcher.sh | 9 ++++++++-
sbin/start-slaves.sh | 9 ++++++++-
3 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/sbin/start-master.sh b/sbin/start-master.sh
index d970fcc45e..97ee32159b 100755
--- a/sbin/start-master.sh
+++ b/sbin/start-master.sh
@@ -48,7 +48,14 @@ if [ "$SPARK_MASTER_PORT" = "" ]; then
fi
if [ "$SPARK_MASTER_HOST" = "" ]; then
- SPARK_MASTER_HOST=`hostname -f`
+ case `uname` in
+ (SunOS)
+ SPARK_MASTER_HOST="`/usr/sbin/check-hostname | awk '{print $NF}'`"
+ ;;
+ (*)
+ SPARK_MASTER_HOST="`hostname -f`"
+ ;;
+ esac
fi
if [ "$SPARK_MASTER_WEBUI_PORT" = "" ]; then
diff --git a/sbin/start-mesos-dispatcher.sh b/sbin/start-mesos-dispatcher.sh
index ef65fb9539..ecaad7ad09 100755
--- a/sbin/start-mesos-dispatcher.sh
+++ b/sbin/start-mesos-dispatcher.sh
@@ -34,7 +34,14 @@ if [ "$SPARK_MESOS_DISPATCHER_PORT" = "" ]; then
fi
if [ "$SPARK_MESOS_DISPATCHER_HOST" = "" ]; then
- SPARK_MESOS_DISPATCHER_HOST=`hostname -f`
+ case `uname` in
+ (SunOS)
+ SPARK_MESOS_DISPATCHER_HOST="`/usr/sbin/check-hostname | awk '{print $NF}'`"
+ ;;
+ (*)
+ SPARK_MESOS_DISPATCHER_HOST="`hostname -f`"
+ ;;
+ esac
fi
if [ "$SPARK_MESOS_DISPATCHER_NUM" = "" ]; then
diff --git a/sbin/start-slaves.sh b/sbin/start-slaves.sh
index 7d8871251f..f5269df523 100755
--- a/sbin/start-slaves.sh
+++ b/sbin/start-slaves.sh
@@ -32,7 +32,14 @@ if [ "$SPARK_MASTER_PORT" = "" ]; then
fi
if [ "$SPARK_MASTER_HOST" = "" ]; then
- SPARK_MASTER_HOST="`hostname -f`"
+ case `uname` in
+ (SunOS)
+ SPARK_MASTER_HOST="`/usr/sbin/check-hostname | awk '{print $NF}'`"
+ ;;
+ (*)
+ SPARK_MASTER_HOST="`hostname -f`"
+ ;;
+ esac
fi
# Launch the slaves
--
GitLab