FST: Allow overriding session, use random session/channel name to allow 2 parallel reconstructions

Author: davidrohr

prodtests/full-system-test/datadistribution.sh

@@ -32,7 +32,7 @@ if [[ $NTIMEFRAMES != -1 ]]; then
 fi
 export TFRATE=$(awk "BEGIN {printf \"%.6f\",1/$TFDELAY}")
 
-ARGS_ALL="--session default --severity $SEVERITY --shm-segment-id 2 --shm-segment-size 1000000 --no-cleanup"
+ARGS_ALL="--session ${OVERRIDE_SESSION:-default} --severity $SEVERITY --shm-segment-id 2 --shm-segment-size 1000000 --no-cleanup"
 
 eval StfBuilder --id stfb --transport shmem \
   --dpl-channel-name dpl-chan --channel-config "name=dpl-chan,type=push,method=bind,address=ipc://@$INRAWCHANNAME,transport=shmem,rateLogging=1" \

prodtests/full-system-test/dpl-workflow.sh

@@ -63,7 +63,7 @@ fi
 
 # ---------------------------------------------------------------------------------------------------------------------
 # Set general arguments
-ARGS_ALL="--session default --severity $SEVERITY --shm-segment-id $NUMAID --shm-segment-size $SHMSIZE $ARGS_ALL_EXTRA --early-forward-policy noraw"
+ARGS_ALL="--session ${OVERRIDE_SESSION:-default} --severity $SEVERITY --shm-segment-id $NUMAID --shm-segment-size $SHMSIZE $ARGS_ALL_EXTRA --early-forward-policy noraw"
 if [ $EPNMODE == 1 ]; then
   ARGS_ALL+=" --infologger-severity $INFOLOGGER_SEVERITY"
   ARGS_ALL+=" --monitoring-backend influxdb-unix:///tmp/telegraf.sock --resources-monitoring 15"

prodtests/full-system-test/raw-reader.sh

@@ -8,7 +8,7 @@ fi
 MYDIR="$(dirname $(readlink -f $0))"
 source $MYDIR/setenv.sh
 
-ARGS_ALL="--session default --shm-throw-bad-alloc 0 --no-cleanup"
+ARGS_ALL="--session ${OVERRIDE_SESSION:-default} --shm-throw-bad-alloc 0 --no-cleanup"
 if [ $NUMAGPUIDS == 1 ]; then
   TMPSIZE=$(expr $DDSHMSIZE \* 1024 \* 1024)
   ARGS_ALL+=" --shm-segment-id 2 --shm-segment-size $TMPSIZE --shm-mlock-segment 1 --shm-zero-segment 1"

prodtests/full-system-test/run-workflow-on-inputlist.sh

@@ -21,9 +21,9 @@ NUM_PROCS=0
 RETVAL=0
 START_TIME=`date +%s`
 LOG_PREFIX="log_$(date +%Y%m%d-%H%M%S)_"
-if [ $2 != "LOCAL" ]; then
-  export INPUT_FILE_LIST=$2
-fi
+[[ $2 != "LOCAL" ]] && export INPUT_FILE_LIST=$2
+[[ -z $OVERRIDE_SESSION ]] && export OVERRIDE_SESSION=default_$$_$RANDOM
+[[ -z $INRAWCHANNAME ]] && export INRAWCHANNAME=tf-builder-$$-$RANDOM
 
 rm -f ${LOG_PREFIX}*.log /dev/shm/*fmq*
 if [[ `ls /dev/shm/*fmq* 2> /dev/null | wc -l` != "0" ]]; then
@@ -68,6 +68,7 @@ fi
 start_process $MYDIR/dpl-workflow.sh
 
 if [[ "0$4" != "00" ]]; then
+  sleep 1
   tail -f ${LOG_PREFIX}*.log &
   PID_LOG=$!
 fi