Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Configuration/PyReleaseValidation/python/MatrixUtil.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
return gpus
9 changes: 7 additions & 2 deletions Utilities/General/scripts/ibeos-lfn-sort
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -48,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