diff --git a/RTCP/Cobalt/GPUProc/src/scripts/Cobalt_install.sh b/RTCP/Cobalt/GPUProc/src/scripts/Cobalt_install.sh index 221e0acf262c543e701fed321dc7d3f55a1f9899..77650bebd398e29984b82380441feb7a81dbb2d9 100755 --- a/RTCP/Cobalt/GPUProc/src/scripts/Cobalt_install.sh +++ b/RTCP/Cobalt/GPUProc/src/scripts/Cobalt_install.sh @@ -41,6 +41,10 @@ ln -sfT ~lofarsys/lofar-userdata/var var # Sym link installed etc/parset-additions.d/override to common location. ln -sfT ~lofarsys/lofar-userdata/parset-overrides etc/parset-additions.d/override +# Sym link installed var/ to NFS location. +ln -sfT /opt/shared/lofar-userdata nfs + + # Set capabilities so our soft real-time programs can elevate prios. # # cap_sys_nice: allow real-time priority for threads diff --git a/RTCP/Cobalt/GPUProc/src/scripts/runObservation.sh b/RTCP/Cobalt/GPUProc/src/scripts/runObservation.sh index 8745d4189b7e32bb7354e8f55e916098265015c4..a6a3e26e69895c67e6388583de732bb01ddc6373 100755 --- a/RTCP/Cobalt/GPUProc/src/scripts/runObservation.sh +++ b/RTCP/Cobalt/GPUProc/src/scripts/runObservation.sh @@ -183,7 +183,7 @@ rm -f $FEEDBACK_FILE if [ "$AUGMENT_PARSET" -eq "1" ] then - AUGMENTED_PARSET=$LOFARROOT/var/run/rtcp-$OBSID.parset + AUGMENTED_PARSET=$LOFARROOT/nfs/parset/rtcp-$OBSID.parset # Add static keys # Ignore sneaky .cobalt/ parset overrides in production (lofarsys). @@ -444,25 +444,6 @@ fi echo "[cobalt] Hosts = $HOSTS" -# Copy parset to all hosts -cksumline=`md5sum $PARSET` -for h in `echo $HOSTS | tr ',' ' '` -do - # Ignore empty hostnames - [ -z "$h" ] && continue; - - # Ignore hostnames that point to us - [ "$h" == "localhost" ] && continue; - [ "$h" == "`hostname`" ] && continue; - - # Ignore hosts that already have the same parset (for example, through NFS). - timeout $KILLOPT 5s ssh -o StrictHostKeyChecking=no -qn $h "[ -f $PARSET ] && echo \"$cksumline\" | md5sum -c --status" && continue - - # Copy parset to remote node - echo "Copying parset to $h:$PARSET" - timeout $KILLOPT 30s scp -o StrictHostKeyChecking=no -Bq $PARSET $h:$PARSET || error "[parset] Could not scp parset to $h" -done - # ************************************ # Start rtcp # *********************************** diff --git a/SubSystems/Online_Cobalt/test/testFuncs.sh.in b/SubSystems/Online_Cobalt/test/testFuncs.sh.in index 0a8bf55b4a3f749e67eb3b4cb07fd22822cf1a9a..5c5f07b39250c9562d29bfea36e61dc734219d69 100755 --- a/SubSystems/Online_Cobalt/test/testFuncs.sh.in +++ b/SubSystems/Online_Cobalt/test/testFuncs.sh.in @@ -17,6 +17,7 @@ error() # Create runtime output directories if not exists. # Not done at build, because it is a post-install setting. Different in production. mkdir -p "$LOFARROOT/var/log" "$LOFARROOT/var/run" || error "Failed to create runtime output directories" +mkdir -p "$LOFARROOT/nfs/parset/" || error "Failed to create shared directories" mkdir -p "$LOFARROOT/etc/parset-additions.d/override" || error "Failed to create runtime input directories" # Set all locales to "C" to avoid problems with, e.g., perl.