Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CVMFS files have moved - Treat them properly #4440

Merged
merged 1 commit into from
Jul 26, 2023
Merged

CVMFS files have moved - Treat them properly #4440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 9 additions & 13 deletions pycbc/workflow/datafind.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -745,19 +745,15 @@ def convert_cachelist_to_filelist(datafindcache_list):

# Populate the PFNs for the File() we just created
if frame.url.startswith('file://'):
currFile.add_pfn(frame.url, site='local')
if frame.url.startswith(
'file:///cvmfs/oasis.opensciencegrid.org/ligo/frames'):
# Datafind returned a URL valid on the osg as well
# so add the additional PFNs to allow OSG access.
currFile.add_pfn(frame.url, site='osg')
elif frame.url.startswith(
'file:///cvmfs/gwosc.osgstorage.org/'):
# Datafind returned a URL valid on the osg as well
# so add the additional PFNs to allow OSG access.
for s in ['osg', 'orangegrid', 'osgconnect']:
currFile.add_pfn(frame.url, site=s)
currFile.add_pfn(frame.url, site="{}-scratch".format(s))
if frame.url.startswith('file:///cvmfs/'):
# Frame is on CVMFS, so let all sites read it directly.
currFile.add_pfn(frame.url, site='all')
else:
# Frame not on CVMFS, so may need transferring.
# Be careful here! If all your frames files are on site
# = local and you try to run on OSG, it will likely
# overwhelm the condor file transfer process!
currFile.add_pfn(frame.url, site='local')
else:
currFile.add_pfn(frame.url, site='notlocal')

Expand Down
2 changes: 1 addition & 1 deletion pycbc/workflow/pegasus_sites.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ def add_osg_site(sitecat, cp):
# On OSG failure rate is high
site.add_profiles(Namespace.DAGMAN, key="retry", value="4")
site.add_profiles(Namespace.ENV, key="LAL_DATA_PATH",
value="/cvmfs/oasis.opensciencegrid.org/ligo/sw/pycbc/lalsuite-extra/current/share/lalsimulation")
value="/cvmfs/software.igwn.org/pycbc/lalsuite-extra/current/share/lalsimulation")
# Add MKL location to LD_LIBRARY_PATH for OSG
site.add_profiles(Namespace.ENV, key="LD_LIBRARY_PATH",
value="/usr/local/lib:/.singularity.d/libs")
Expand Down