diff options
| author | Nathan Kronenfeld <nkronenfeld@oculusinfo.com> | 2015-04-13 18:21:16 -0700 |
|---|---|---|
| committer | Andrew Or <andrew@databricks.com> | 2015-04-13 18:21:16 -0700 |
| commit | 435b8779df01a7477addecb1023605957bca4e9b (patch) | |
| tree | 19bdc327afca005b5cec0005b0f9d0f78ce83233 /sbin/start-slaves.sh | |
| parent | 4898dfa464be55772e3f9db10c48adcb3cfc9a3d (diff) | |
| download | spark-435b8779df01a7477addecb1023605957bca4e9b.tar.gz spark-435b8779df01a7477addecb1023605957bca4e9b.tar.bz2 spark-435b8779df01a7477addecb1023605957bca4e9b.zip | |
[Spark-4848] Allow different Worker configurations in standalone cluster
This refixes #3699 with the latest code.
This fixes SPARK-4848
I've changed the stand-alone cluster scripts to allow different workers to have different numbers of instances, with both port and web-ui port following allong appropriately.
I did this by moving the loop over instances from start-slaves and stop-slaves (on the master) to start-slave and stop-slave (on the worker).
Wile I was at it, I changed SPARK_WORKER_PORT to work the same way as SPARK_WORKER_WEBUI_PORT, since the new methods work fine for both.
Author: Nathan Kronenfeld <nkronenfeld@oculusinfo.com>
Closes #5140 from nkronenfeld/feature/spark-4848 and squashes the following commits:
cf5f47e [Nathan Kronenfeld] Merge remote branch 'upstream/master' into feature/spark-4848
044ca6f [Nathan Kronenfeld] Documentation and formatting as requested by by andrewor14
d739640 [Nathan Kronenfeld] Move looping through instances from the master to the workers, so that each worker respects its own number of instances and web-ui port
Diffstat (limited to 'sbin/start-slaves.sh')
| -rwxr-xr-x | sbin/start-slaves.sh | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/sbin/start-slaves.sh b/sbin/start-slaves.sh index 4356c03657..24d6268815 100755 --- a/sbin/start-slaves.sh +++ b/sbin/start-slaves.sh @@ -59,13 +59,4 @@ if [ "$START_TACHYON" == "true" ]; then fi # Launch the slaves -if [ "$SPARK_WORKER_INSTANCES" = "" ]; then - exec "$sbin/slaves.sh" cd "$SPARK_HOME" \; "$sbin/start-slave.sh" 1 "spark://$SPARK_MASTER_IP:$SPARK_MASTER_PORT" -else - if [ "$SPARK_WORKER_WEBUI_PORT" = "" ]; then - SPARK_WORKER_WEBUI_PORT=8081 - fi - for ((i=0; i<$SPARK_WORKER_INSTANCES; i++)); do - "$sbin/slaves.sh" cd "$SPARK_HOME" \; "$sbin/start-slave.sh" $(( $i + 1 )) --webui-port $(( $SPARK_WORKER_WEBUI_PORT + $i )) "spark://$SPARK_MASTER_IP:$SPARK_MASTER_PORT" - done -fi +"$sbin/slaves.sh" cd "$SPARK_HOME" \; "$sbin/start-slave.sh" "spark://$SPARK_MASTER_IP:$SPARK_MASTER_PORT" |