Skip to content

Commit aa470fe

Browse files
jerryshaojerryshao
committed
Address the same issue for sbin scripts
1 parent 350bec9 commit aa470fe

21 files changed

+474
-53
lines changed

‎sbin/slaves.sh‎

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,29 @@ if [ $# -le 0 ]; then
3636
exit 1
3737
fi
3838

39-
sbin="`dirname "$0"`"
40-
sbin="`cd "$sbin"; pwd`"
39+
realpath () {
40+
(
41+
TARGET_FILE="$1"
42+
43+
cd "$(dirname "$TARGET_FILE")"
44+
TARGET_FILE="$(basename "$TARGET_FILE")"
45+
46+
COUNT=0
47+
while [ -L "$TARGET_FILE" -a $COUNT -lt 100 ]
48+
do
49+
TARGET_FILE="$(readlink "$TARGET_FILE")"
50+
cd $(dirname "$TARGET_FILE")
51+
TARGET_FILE="$(basename $TARGET_FILE)"
52+
COUNT=$(($COUNT + 1))
53+
done
54+
55+
echo "$(pwd -P)/"$TARGET_FILE""
56+
)
57+
}
58+
59+
# Figure out where Spark is installed
60+
sbin="$(dirname "$(realpath "$0")")"
61+
sbin="$(cd "$sbin"; pwd)"
4162

4263
. "$sbin/spark-config.sh"
4364

‎sbin/spark-daemon.sh‎

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,28 @@ if [ $# -le 1 ]; then
3737
exit 1
3838
fi
3939

40-
sbin="`dirname "$0"`"
41-
sbin="`cd "$sbin"; pwd`"
40+
realpath () {
41+
(
42+
TARGET_FILE="$1"
43+
44+
cd "$(dirname "$TARGET_FILE")"
45+
TARGET_FILE="$(basename "$TARGET_FILE")"
46+
47+
COUNT=0
48+
while [ -L "$TARGET_FILE" -a $COUNT -lt 100 ]
49+
do
50+
TARGET_FILE="$(readlink "$TARGET_FILE")"
51+
cd $(dirname "$TARGET_FILE")
52+
TARGET_FILE="$(basename $TARGET_FILE)"
53+
COUNT=$(($COUNT + 1))
54+
done
55+
56+
echo "$(pwd -P)/"$TARGET_FILE""
57+
)
58+
}
59+
60+
sbin="$(dirname "$(realpath "$0")")"
61+
sbin="$(cd "$sbin"; pwd)"
4262

4363
. "$sbin/spark-config.sh"
4464

@@ -205,13 +225,13 @@ case $option in
205225
else
206226
echo $pid file is present but $command not running
207227
exit 1
208-
fi
228+
fi
209229
else
210230
echo $command not running.
211231
exit 2
212-
fi
232+
fi
213233
;;
214-
234+
215235
(*)
216236
echo $usage
217237
exit 1

‎sbin/spark-daemons.sh‎

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,28 @@ if [ $# -le 1 ]; then
2727
exit 1
2828
fi
2929

30-
sbin=`dirname "$0"`
31-
sbin=`cd "$sbin"; pwd`
30+
realpath () {
31+
(
32+
TARGET_FILE="$1"
33+
34+
cd "$(dirname "$TARGET_FILE")"
35+
TARGET_FILE="$(basename "$TARGET_FILE")"
36+
37+
COUNT=0
38+
while [ -L "$TARGET_FILE" -a $COUNT -lt 100 ]
39+
do
40+
TARGET_FILE="$(readlink "$TARGET_FILE")"
41+
cd $(dirname "$TARGET_FILE")
42+
TARGET_FILE="$(basename $TARGET_FILE)"
43+
COUNT=$(($COUNT + 1))
44+
done
45+
46+
echo "$(pwd -P)/"$TARGET_FILE""
47+
)
48+
}
49+
50+
sbin="$(dirname "$(realpath "$0")")"
51+
sbin="$(cd "$sbin"; pwd)"
3252

3353
. "$sbin/spark-config.sh"
3454

‎sbin/start-all.sh‎

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,28 @@
2121
# Starts the master on this node.
2222
# Starts a worker on each node specified in conf/slaves
2323

24-
sbin="`dirname "$0"`"
25-
sbin="`cd "$sbin"; pwd`"
24+
realpath () {
25+
(
26+
TARGET_FILE="$1"
27+
28+
cd "$(dirname "$TARGET_FILE")"
29+
TARGET_FILE="$(basename "$TARGET_FILE")"
30+
31+
COUNT=0
32+
while [ -L "$TARGET_FILE" -a $COUNT -lt 100 ]
33+
do
34+
TARGET_FILE="$(readlink "$TARGET_FILE")"
35+
cd $(dirname "$TARGET_FILE")
36+
TARGET_FILE="$(basename $TARGET_FILE)"
37+
COUNT=$(($COUNT + 1))
38+
done
39+
40+
echo "$(pwd -P)/"$TARGET_FILE""
41+
)
42+
}
43+
44+
sbin="$(dirname "$(realpath "$0")")"
45+
sbin="$(cd "$sbin"; pwd)"
2646

2747
TACHYON_STR=""
2848

‎sbin/start-history-server.sh‎

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,28 @@
2424
# Use the SPARK_HISTORY_OPTS environment variable to set history server configuration.
2525
#
2626

27-
sbin="`dirname "$0"`"
28-
sbin="`cd "$sbin"; pwd`"
27+
realpath () {
28+
(
29+
TARGET_FILE="$1"
30+
31+
cd "$(dirname "$TARGET_FILE")"
32+
TARGET_FILE="$(basename "$TARGET_FILE")"
33+
34+
COUNT=0
35+
while [ -L "$TARGET_FILE" -a $COUNT -lt 100 ]
36+
do
37+
TARGET_FILE="$(readlink "$TARGET_FILE")"
38+
cd $(dirname "$TARGET_FILE")
39+
TARGET_FILE="$(basename $TARGET_FILE)"
40+
COUNT=$(($COUNT + 1))
41+
done
42+
43+
echo "$(pwd -P)/"$TARGET_FILE""
44+
)
45+
}
46+
47+
sbin="$(dirname "$(realpath "$0")")"
48+
sbin="$(cd "$sbin"; pwd)"
2949

3050
. "$sbin/spark-config.sh"
3151
. "$SPARK_PREFIX/bin/load-spark-env.sh"

‎sbin/start-master.sh‎

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,28 @@
1919

2020
# Starts the master on the machine this script is executed on.
2121

22-
sbin="`dirname "$0"`"
23-
sbin="`cd "$sbin"; pwd`"
22+
realpath () {
23+
(
24+
TARGET_FILE="$1"
25+
26+
cd "$(dirname "$TARGET_FILE")"
27+
TARGET_FILE="$(basename "$TARGET_FILE")"
28+
29+
COUNT=0
30+
while [ -L "$TARGET_FILE" -a $COUNT -lt 100 ]
31+
do
32+
TARGET_FILE="$(readlink "$TARGET_FILE")"
33+
cd $(dirname "$TARGET_FILE")
34+
TARGET_FILE="$(basename $TARGET_FILE)"
35+
COUNT=$(($COUNT + 1))
36+
done
37+
38+
echo "$(pwd -P)/"$TARGET_FILE""
39+
)
40+
}
41+
42+
sbin="$(dirname "$(realpath "$0")")"
43+
sbin="$(cd "$sbin"; pwd)"
2444

2545
ORIGINAL_ARGS="$@"
2646

‎sbin/start-mesos-dispatcher.sh‎

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,28 @@
2121
# Rest server to handle driver requests for Mesos cluster mode.
2222
# Only one cluster dispatcher is needed per Mesos cluster.
2323

24-
sbin="`dirname "$0"`"
25-
sbin="`cd "$sbin"; pwd`"
24+
realpath () {
25+
(
26+
TARGET_FILE="$1"
27+
28+
cd "$(dirname "$TARGET_FILE")"
29+
TARGET_FILE="$(basename "$TARGET_FILE")"
30+
31+
COUNT=0
32+
while [ -L "$TARGET_FILE" -a $COUNT -lt 100 ]
33+
do
34+
TARGET_FILE="$(readlink "$TARGET_FILE")"
35+
cd $(dirname "$TARGET_FILE")
36+
TARGET_FILE="$(basename $TARGET_FILE)"
37+
COUNT=$(($COUNT + 1))
38+
done
39+
40+
echo "$(pwd -P)/"$TARGET_FILE""
41+
)
42+
}
43+
44+
sbin="$(dirname "$(realpath "$0")")"
45+
sbin="$(cd "$sbin"; pwd)"
2646

2747
. "$sbin/spark-config.sh"
2848

‎sbin/start-mesos-shuffle-service.sh‎

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,28 @@
2626
# Use the SPARK_SHUFFLE_OPTS environment variable to set shuffle service configuration.
2727
#
2828

29-
sbin="`dirname "$0"`"
30-
sbin="`cd "$sbin"; pwd`"
29+
realpath () {
30+
(
31+
TARGET_FILE="$1"
32+
33+
cd "$(dirname "$TARGET_FILE")"
34+
TARGET_FILE="$(basename "$TARGET_FILE")"
35+
36+
COUNT=0
37+
while [ -L "$TARGET_FILE" -a $COUNT -lt 100 ]
38+
do
39+
TARGET_FILE="$(readlink "$TARGET_FILE")"
40+
cd $(dirname "$TARGET_FILE")
41+
TARGET_FILE="$(basename $TARGET_FILE)"
42+
COUNT=$(($COUNT + 1))
43+
done
44+
45+
echo "$(pwd -P)/"$TARGET_FILE""
46+
)
47+
}
48+
49+
sbin="$(dirname "$(realpath "$0")")"
50+
sbin="$(cd "$sbin"; pwd)"
3151

3252
. "$sbin/spark-config.sh"
3353
. "$SPARK_PREFIX/bin/load-spark-env.sh"

‎sbin/start-shuffle-service.sh‎

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,28 @@
2424
# Use the SPARK_SHUFFLE_OPTS environment variable to set shuffle server configuration.
2525
#
2626

27-
sbin="`dirname "$0"`"
28-
sbin="`cd "$sbin"; pwd`"
27+
realpath () {
28+
(
29+
TARGET_FILE="$1"
30+
31+
cd "$(dirname "$TARGET_FILE")"
32+
TARGET_FILE="$(basename "$TARGET_FILE")"
33+
34+
COUNT=0
35+
while [ -L "$TARGET_FILE" -a $COUNT -lt 100 ]
36+
do
37+
TARGET_FILE="$(readlink "$TARGET_FILE")"
38+
cd $(dirname "$TARGET_FILE")
39+
TARGET_FILE="$(basename $TARGET_FILE)"
40+
COUNT=$(($COUNT + 1))
41+
done
42+
43+
echo "$(pwd -P)/"$TARGET_FILE""
44+
)
45+
}
46+
47+
sbin="$(dirname "$(realpath "$0")")"
48+
sbin="$(cd "$sbin"; pwd)"
2949

3050
. "$sbin/spark-config.sh"
3151
. "$SPARK_PREFIX/bin/load-spark-env.sh"

‎sbin/start-slave.sh‎

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@
2121
#
2222
# Environment Variables
2323
#
24-
# SPARK_WORKER_INSTANCES The number of worker instances to run on this
24+
# SPARK_WORKER_INSTANCES The number of worker instances to run on this
2525
# slave. Default is 1.
26-
# SPARK_WORKER_PORT The base port number for the first worker. If set,
26+
# SPARK_WORKER_PORT The base port number for the first worker. If set,
2727
# subsequent workers will increment this number. If
2828
# unset, Spark will find a valid port number, but
2929
# with no guarantee of a predictable pattern.
3030
# SPARK_WORKER_WEBUI_PORT The base port for the web interface of the first
31-
# worker. Subsequent workers will increment this
31+
# worker. Subsequent workers will increment this
3232
# number. Default is 8081.
3333

3434
usage="Usage: start-slave.sh <spark-master-URL> where <spark-master-URL> is like spark://localhost:7077"
@@ -39,8 +39,28 @@ if [ $# -lt 1 ]; then
3939
exit 1
4040
fi
4141

42-
sbin="`dirname "$0"`"
43-
sbin="`cd "$sbin"; pwd`"
42+
realpath () {
43+
(
44+
TARGET_FILE="$1"
45+
46+
cd "$(dirname "$TARGET_FILE")"
47+
TARGET_FILE="$(basename "$TARGET_FILE")"
48+
49+
COUNT=0
50+
while [ -L "$TARGET_FILE" -a $COUNT -lt 100 ]
51+
do
52+
TARGET_FILE="$(readlink "$TARGET_FILE")"
53+
cd $(dirname "$TARGET_FILE")
54+
TARGET_FILE="$(basename $TARGET_FILE)"
55+
COUNT=$(($COUNT + 1))
56+
done
57+
58+
echo "$(pwd -P)/"$TARGET_FILE""
59+
)
60+
}
61+
62+
sbin="$(dirname "$(realpath "$0")")"
63+
sbin="$(cd "$sbin"; pwd)"
4464

4565
. "$sbin/spark-config.sh"
4666

@@ -82,4 +102,3 @@ else
82102
start_instance $(( 1 + $i )) "$@"
83103
done
84104
fi
85-

0 commit comments

Comments
 (0)