refactored some common code ; setting default value for metadata attribute correctly

Author: cjac

dask/dask.sh

@@ -807,7 +807,7 @@ function install_systemd_dask_worker() {
   local compute_mode_cmd=""
   if command -v nvidia-smi ; then compute_mode_cmd="nvidia-smi --compute-mode=DEFAULT" ; fi
   local worker_name="dask worker"
-  if test -f "${DASK_CONDA_ENV}/bin/dask-cuda-worker" ; then worker_name="dask-cuda worker" ; fi
+  if test -f "${DASK_CONDA_ENV}/bin/dask-cuda" ; then worker_name="dask-cuda worker" ; fi
   local worker="${DASK_CONDA_ENV}/bin/${worker_name}"
   cat <<EOF >"${DASK_WORKER_LAUNCHER}"
 #!/bin/bash
@@ -898,6 +898,39 @@ function install_systemd_dask_service() {
   install_systemd_dask_worker
 }
 
+function start_systemd_dask_service() {
+  # only run scheduler on primary master
+  if [[ "$(hostname -s)" == "${MASTER}" ]]; then
+    date
+    time systemctl start "${DASK_SCHEDULER_SERVICE}"
+    local substate_val="$(systemctl show ${DASK_SCHEDULER_SERVICE} -p SubState --value)"
+    if [[ "${substate_val}" != 'running' ]] ; then
+      cat "/var/log/${DASK_SCHEDULER_SERVICE}.log"
+    fi
+    systemctl status "${DASK_SCHEDULER_SERVICE}"
+  fi
+
+  echo "Starting Dask 'standalone' cluster..."
+  if [[ "${enable_systemd_dask_worker_service}" == "1" ]]; then
+    date
+    # Pause while scheduler comes online
+    retries=30
+    while ! nc -vz "${MASTER}" 8786 ; do
+      sleep 3s
+      ((retries--))
+      if [[ "${retries}" == "0" ]] ; then echo "dask scheduler unreachable" ; exit 1 ; fi
+    done
+    time systemctl start "${DASK_WORKER_SERVICE}"
+    local substate_val="$(systemctl show ${DASK_WORKER_SERVICE} -p SubState --value)"
+    if [[ "${substate_val}" != 'running' ]] ; then
+      cat "/var/log/${DASK_WORKER_SERVICE}.log"
+    fi
+    systemctl status "${DASK_WORKER_SERVICE}"
+  fi
+
+  date
+}
+
 function configure_knox_for_dask() {
   if [[ ! -d "${KNOX_HOME}" ]]; then
     echo "Skip configuring Knox rules for Dask"
@@ -1273,37 +1306,8 @@ function main() {
   elif [[ "${DASK_RUNTIME}" == "standalone" ]]; then
     # Create Dask service
     install_systemd_dask_service
+    start_systemd_dask_service
 
-    # only run scheduler on primary master
-    if [[ "$(hostname -s)" == "${MASTER}" ]]; then
-      date
-      time systemctl start "${DASK_SCHEDULER_SERVICE}"
-      local substate_val="$(systemctl show ${DASK_SCHEDULER_SERVICE} -p SubState --value)"
-      if [[ "${substate_val}" != 'running' ]] ; then
-        cat "/var/log/${DASK_SCHEDULER_SERVICE}.log"
-      fi
-      systemctl status "${DASK_SCHEDULER_SERVICE}"
-    fi
-
-    echo "Starting Dask 'standalone' cluster..."
-    if [[ "${enable_systemd_dask_worker_service}" == "1" ]]; then
-      date
-      # Pause while scheduler comes online
-      retries=30
-      while ! nc -vz "${MASTER}" 8786 ; do
-        sleep 3s
-        ((retries--))
-        if [[ "${retries}" == "0" ]] ; then echo "dask scheduler unreachable" ; exit 1 ; fi
-      done
-      time systemctl start "${DASK_WORKER_SERVICE}"
-      local substate_val="$(systemctl show ${DASK_WORKER_SERVICE} -p SubState --value)"
-      if [[ "${substate_val}" != 'running' ]] ; then
-        cat "/var/log/${DASK_WORKER_SERVICE}.log"
-      fi
-      systemctl status "${DASK_WORKER_SERVICE}"
-    fi
-
-    date
     configure_knox_for_dask
 
     local DASK_CLOUD_LOGGING="$(get_metadata_attribute dask-cloud-logging || echo 'false')"
@@ -1325,7 +1329,7 @@ function exit_handler() {
 
 function prepare_to_install(){
   prepare_common_env
-  conda_env="$(get_metadata_attribute conda-env || echo 'dask')"
+  conda_env="$(get_metadata_attribute conda-env 'dask')"
   readonly conda_env
   prepare_dask_env
   trap exit_handler EXIT