Improve defaults for xrootd

o2-full-system-test.sh

@@ -25,10 +25,6 @@ export NHBPERTF=128
 export SHMSIZE=8000000000
 export NJOBS="$JOBS"
 export DPL_REPORT_PROCESSING=1
-export XRD_CONNECTIONWINDOW=3
-export XRD_CONNECTIONRETRY=1
-export XRD_TIMEOUTRESOLUTION=1
-export XRD_REQUESTTIMEOUT=60
 
 WORKFLOW_EXTRA_PROCESSING_STEPS=TPC_DEDX,MFT_RECO,MID_RECO,MCH_RECO,MATCH_MFTMCH,MATCH_MCHMID,MUON_SYNC_RECO,ZDC_RECO FST_SYNC_EXTRA_WORKFLOW_PARAMETERS=QC,CALIB_LOCAL_AGGREGATOR,CALIB_LOCAL_INTEGRATED_AGGREGATOR QC_REDIRECT_MERGER_TO_LOCALHOST=1 GEN_TOPO_WORKDIR=`pwd` ALICE_O2SIM_DUMPLOG=1 NEvents=5 NEventsQED=100 O2SIMSEED=12345 $O2_ROOT/prodtests/full_system_test.sh
 $O2_ROOT/prodtests/full_system_test_ci_extra_tests.sh

o2-sim-challenge-test.sh

@@ -19,9 +19,6 @@ export JOBUTILS_PRINT_ON_ERROR=1
 export JOBUTILS_JOB_TIMEOUT=2400
 export NJOBS="$JOBS"
 export DPL_REPORT_PROCESSING=1
-export XRD_CONNECTIONWINDOW=3
-export XRD_CONNECTIONRETRY=1
-export XRD_TIMEOUTRESOLUTION=1
 
 rm -Rf $BUILDDIR/sim-challenge
 mkdir $BUILDDIR/sim-challenge

xrootd.sh

@@ -15,6 +15,11 @@ build_requires:
   - alibuild-recipe-tools
 prepend_path:
   PYTHONPATH: "${XROOTD_ROOT}/lib/python/site-packages"
+env:
+  XRD_CONNECTIONWINDOW: "3"
+  XRD_CONNECTIONRETRY: "1"
+  XRD_TIMEOUTRESOLUTION: "1"
+  XRD_REQUESTTIMEOUT: "60"
 ---
 #!/bin/bash -e
 
@@ -136,7 +141,17 @@ mkdir -p "$MODULEDIR"
 
 alibuild-generate-module --bin --lib --cmake > "$MODULEFILE"
 
+case $ARCHITECTURE in
+  slc[78]*) OPTIONAL_ENV= ;;
+  *) OPTIONAL_ENV="--set-if-undef " ;;
+esac
+
 cat >> "$MODULEFILE" <<EoF
+setenv ${OPTIONAL_ENV}XRD_CONNECTIONWINDOW 3
+setenv ${OPTIONAL_ENV}XRD_CONNECTIONRETRY 1
+setenv ${OPTIONAL_ENV}XRD_TIMEOUTRESOLUTION 1
+setenv ${OPTIONAL_ENV}XRD_REQUESTTIMEOUT 60
+
 if { $XROOTD_PYTHON } {
   prepend-path PYTHONPATH \$PKG_ROOT/lib/python/site-packages
   # This is probably redundant, but should not harm.