Task #9939: cherry pick merge r37508 from trunk (originally from...

Task #9939: cherry pick merge r37508 from trunk (originally from SAS-RA_DRAGNET-Task9939): COBALT startup scripts improvements for DRAGNET

RTCP/Cobalt/GPUProc/etc/parset-additions.d/default/OutputProc.parset.in

@@ -10,7 +10,8 @@ Cobalt.OutputProc.sshPrivateKey =
 
 # The executable of the process to start.
 # which thus needs to be found in $PATH after login.
-Cobalt.OutputProc.executable = source /data/home/lofarsys/production/lofar_cobalt/lofarinit.sh; outputProc
+# Sourcing the right path in runObservation.sh goes via cobalt_functions.sh.
+Cobalt.OutputProc.executable = outputProc
 
 # The directory where OutputProc can find the StaticMetaData
 Cobalt.OutputProc.StaticMetaDataDirectory = /data/home/lofarsys/production/lofar_cobalt/etc

RTCP/Cobalt/GPUProc/src/scripts/cobalt_functions.sh

@@ -52,7 +52,8 @@ function read_cluster_model {
   case "${CLUSTER_NAME}" in
     CEP4)
       HEADNODE=head01.cep4.control.lofar
-      COMPUTENODES="`ssh $HEADNODE sinfo --responding --states=idle,mixed,alloc --format=%n.cep4,%T --noheader --partition=cpu --sort=N | fgrep -v ,draining | cut -f1 -d,`"
+      SLURM_PARTITION=cpu
+      COMPUTENODES="`ssh $HEADNODE sinfo --responding --states=idle,mixed,alloc --format=%n.cep4,%T --noheader --partition=$SLURM_PARTITION --sort=N | fgrep -v ,draining | cut -f1 -d,`"
       if [ -z "$COMPUTENODES" ]; then
         echo "ERROR: Could not obtain list of available CEP4 nodes. Defaulting to all."
         COMPUTENODES="`seq -f "cpu%02.0f.cep4" 1 50`"
@@ -69,28 +70,23 @@ function read_cluster_model {
       ;;
     DRAGNET)
       HEADNODE=dragnet.control.lofar
-      COMPUTENODES="`ssh $HEADNODE sinfo --responding --states=idle,mixed,alloc --format=%n.control.lofar,%T --noheader --partition=lofarobs --sort=N | fgrep -v ,draining | cut -f1 -d,`"
+      SLURM_PARTITION=lofarobs  # NOTE: sinfo (without -a) only displays this partition for members of the lofarsys group (+ slurm,root)
+      COMPUTENODES="`ssh $HEADNODE sinfo --responding --states=idle,mixed,alloc --format=%n.control.lofar,%T --noheader --partition=$SLURM_PARTITION --sort=N | fgrep -v ,draining | cut -f1 -d,`"
       if [ -z "$COMPUTENODES" ]; then
         echo "ERROR: Could not obtain list of available DRAGNET nodes. Defaulting to drg01 - drg20 .control.lofar"
         COMPUTENODES="`seq -f "drg%02.0f.control.lofar" 1 20`"
       fi
 
       #SLURM=true
-      SLURM=false
+      SLURM=false # Don't use SLURM for now, let's get it working without it first
       GLOBALFS=false
       DOCKER=false
 
       OUTPUTPROC_ROOT="/opt/lofar"
       ;;
     *)
-      HEADNODE=lhn001.cep2.lofar
-      COMPUTENODES="`seq -f "locus%02.0f" 1 94`"
-
-      SLURM=false
-      GLOBALFS=false
-      DOCKER=false
-
-      OUTPUTPROC_ROOT="/data/home/lofarsys/production/lofar_cobalt"
+      echo "ERROR: unknown cluster name from parset storageClusterName key(s): $CLUSTER_NAME"
+      exit 1
       ;;
   esac