Merge pull request #7 from rf972/master

Merge latest fixes.

spark/docker/start-master.sh

@@ -20,12 +20,11 @@ fi
 if [ $RUNNING_MODE = "interactive" ]; then
   DOCKER_IT="-i -t"
 fi
-
+#  --cpuset-cpus="9-12" \
 DOCKER_RUN="docker run ${DOCKER_IT} --rm \
   -p 4040:4040 -p 6066:6066 -p 7077:7077 -p 8080:8080 -p 5005:5005 -p 18080:18080 \
   --expose 7001 --expose 7002 --expose 7003 --expose 7004 --expose 7005 --expose 7077 --expose 6066 \
   --name sparkmaster \
-  --cpuset-cpus="9-12" \
   --network dike-net \
   -e MASTER=spark://sparkmaster:7077 \
   -e SPARK_CONF_DIR=/conf \
@@ -58,7 +57,7 @@ if [ $RUNNING_MODE = "interactive" ]; then
 else
   eval "${DOCKER_RUN}" &
   while [ ! -f "${ROOT_DIR}/volume/status/SPARK_MASTER_STATE" ]; do
-    sleep 1  
+    sleep 1
   done
 
   cat "${ROOT_DIR}/volume/status/SPARK_MASTER_STATE"

spark/docker/start-worker.sh

@@ -19,11 +19,10 @@ fi
 if [ $RUNNING_MODE = "interactive" ]; then
   DOCKER_IT="-i -t"
 fi
-
+#  --cpuset-cpus="16-19" \
 DOCKER_RUN="docker run ${DOCKER_IT} --rm -p 8081:8081 \
   --expose 7012 --expose 7013 --expose 7014 --expose 7015 --expose 8881 \
   --name sparkworker \
-  --cpuset-cpus="16-19" \
   --network dike-net \
   -e SPARK_CONF_DIR=/conf \
       -e SPARK_WORKER_CORES=2 \
@@ -46,13 +45,13 @@ DOCKER_RUN="docker run ${DOCKER_IT} --rm -p 8081:8081 \
   -u ${USER_ID} \
   spark-run-${USER_NAME} ${CMD}"
 
-    
+
 if [ $RUNNING_MODE = "interactive" ]; then
   eval "${DOCKER_RUN}"
 else
   eval "${DOCKER_RUN}" &
   while [ ! -f "${ROOT_DIR}/volume/status/SPARK_WORKER_STATE" ]; do
-    sleep 1  
+    sleep 1
   done
 
   cat "${ROOT_DIR}/volume/status/SPARK_WORKER_STATE"