Skip to content

Commit 1bba8a9

Browse files
committed
Added SPARK_SSH_FOREGROUND flag to sbin/slaves
1 parent 88e2f17 commit 1bba8a9

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

sbin/slaves.sh

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,16 @@ if [ "$SPARK_SSH_OPTS" = "" ]; then
8787
fi
8888

8989
for slave in `echo "$HOSTLIST"|sed "s/#.*$//;/^$/d"`; do
90-
ssh $SPARK_SSH_OPTS "$slave" $"${@// /\\ }" \
91-
2>&1 | sed "s/^/$slave: /"
92-
if [ "$SPARK_SLAVE_SLEEP" != "" ]; then
93-
sleep $SPARK_SLAVE_SLEEP
94-
fi
90+
if [ "${SPARK_SSH_FOREGROUND}" = "y" ] || [ "${SPARK_SSH_FOREGROUND}" = "yes" ]; then
91+
ssh $SPARK_SSH_OPTS "$slave" $"${@// /\\ }" \
92+
2>&1 | sed "s/^/$slave: /"
93+
else
94+
ssh $SPARK_SSH_OPTS "$slave" $"${@// /\\ }" \
95+
2>&1 | sed "s/^/$slave: /" &
96+
fi
97+
if [ "$SPARK_SLAVE_SLEEP" != "" ]; then
98+
sleep $SPARK_SLAVE_SLEEP
99+
fi
95100
done
96101

97102
wait

0 commit comments

Comments
 (0)