From fd0fa649b9ab8e81021e1ba8d83058d60ac6d562 Mon Sep 17 00:00:00 2001 From: Kevin Pedro Date: Mon, 17 Nov 2025 16:40:09 -0600 Subject: [PATCH 1/3] remove unnecessary call --- Configuration/PyReleaseValidation/python/MatrixUtil.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Configuration/PyReleaseValidation/python/MatrixUtil.py b/Configuration/PyReleaseValidation/python/MatrixUtil.py index c45437f8a66cf..a1d6010414fc7 100644 --- a/Configuration/PyReleaseValidation/python/MatrixUtil.py +++ b/Configuration/PyReleaseValidation/python/MatrixUtil.py @@ -141,7 +141,7 @@ def das(self, das_options, dataset): if not self.skimEvents: ## keep run-lumi sorting from os import getenv if getenv("CMSSW_USE_IBEOS","false")=="true": - return "export CMSSW_USE_IBEOS=true; " + command + " | ibeos-lfn-sort" + return "export CMSSW_USE_IBEOS=true; " + command return command + " | sort -u" else: return command @@ -332,4 +332,4 @@ def cleanComputeCapabilities(make, offset = 0): gpus = [AvailableGPU(make.upper(), i + offset, int(f[0]),f[1]," ".join(f[2:])) for i,f in enumerate(gpus)] - return gpus \ No newline at end of file + return gpus From 4a72347ed6df5811c7e4af40ee1e9d227b6a0ac5 Mon Sep 17 00:00:00 2001 From: Kevin Pedro Date: Mon, 17 Nov 2025 16:46:08 -0600 Subject: [PATCH 2/3] allow ibeos-lfn-sort to recognize its own output --- Utilities/General/scripts/ibeos-lfn-sort | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Utilities/General/scripts/ibeos-lfn-sort b/Utilities/General/scripts/ibeos-lfn-sort index d03d5edcc226d..25bb546226a8f 100755 --- a/Utilities/General/scripts/ibeos-lfn-sort +++ b/Utilities/General/scripts/ibeos-lfn-sort @@ -12,6 +12,7 @@ if [ "$CMSSW_USE_IBEOS" != "true" ]; then exit 1 fi +IBEOS_PFN="root://eoscms.cern.ch//store/user/cmsbuild" IBEOS_FILES="" NON_IBEOS_FILES="" # try to download cache @@ -32,11 +33,15 @@ if [ -f ${IBEOS_CACHE} ] ; then case $LFN in /store/* ) if [ $(grep "^${LFN}$" ${IBEOS_CACHE} | wc -l) -gt 0 ] ; then - IBEOS_FILES="$IBEOS_FILES root://eoscms.cern.ch//store/user/cmsbuild${LFN}" + IBEOS_FILES="$IBEOS_FILES ${IBEOS_PFN}${LFN}" else NON_IBEOS_FILES="$NON_IBEOS_FILES $LFN" fi ;; + ${IBEOS_PFN}* ) + # line from a repeated call: just keep the previous result + IBEOS_FILES="$IBEOS_FILES ${LFN}" + ;; esac done # in case the cache did not download From f2663390f4de8fe55eca91d59f1b3ebc889c6907 Mon Sep 17 00:00:00 2001 From: Kevin Pedro Date: Mon, 17 Nov 2025 16:56:28 -0600 Subject: [PATCH 3/3] default to printing all results --- Utilities/General/scripts/ibeos-lfn-sort | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Utilities/General/scripts/ibeos-lfn-sort b/Utilities/General/scripts/ibeos-lfn-sort index 25bb546226a8f..2b7c824c4eb58 100755 --- a/Utilities/General/scripts/ibeos-lfn-sort +++ b/Utilities/General/scripts/ibeos-lfn-sort @@ -53,6 +53,6 @@ else done fi if [ -z "$CMSSW_LIMIT_RESULTS" ]; then - CMSSW_LIMIT_RESULTS=20 + CMSSW_LIMIT_RESULTS=-0 fi echo $(echo $IBEOS_FILES | tr ' ' '\n' | sort -u) $(echo $NON_IBEOS_FILES | tr ' ' '\n' | sort -u) | tr ' ' '\n' | grep '/store' | head -n $CMSSW_LIMIT_RESULTS