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

Cmslinks issues #803

Merged
merged 1 commit into from
May 31, 2024
Merged

Cmslinks issues #803

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
51 changes: 31 additions & 20 deletions docker/rucio_client/scripts/cmslinks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import logging
import os
import re
import sys

from rucio.client import Client

Expand Down Expand Up @@ -71,10 +72,21 @@ def _get_rselist(self, rselist=None):
sites = json.loads(base64.b64decode(f.content))
except Exception as e:
logging.warning(f'No PNN for RSE {rse}. Trying to get it from gitlab. Error: {str(e)}')
continue
for site in sites:
if site.get('rse') in rse:
pnn = site.get('site')
break
# Error handling in case there are issues retrieving info from sites' dicts
try:
if site.get('rse') in rse:
pnn = site.get('site')
break
except Exception as e:
logging.warning(f'Problem getting PNN from gitlab for RSE {rse} SITE {site.get("site")}. Error: {str(e)}')

# If PNN could be retrieved skip to the next RSE (do not add entry to the list)
if pnn is None:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can add the continue under exceptions above.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The problem here is that the desired 'rse' field may be empty. Moving continue under the exception above will skip to the next site. However, in case that no sites have the 'rse' field set, the pnn value will remain 'None'. Appending this value to self.rselist will create problems in other parts of the code. So, preventing RSEs with pnn value of None to be appended in the list is mandatory.

logging.warning(f'No PNN found in github for RSE {rse}.')
continue

try:
self.rselist.append({
'rse': rse,
Expand Down Expand Up @@ -161,15 +173,15 @@ def update(self, overwrite=False, disable=True, dry=False, srcselect=r'\S+', dst

for src in self.rselist:
srse = src['rse']
logging.info("Setting links from %s to %s other RSEs.", srse, len(self.rselist))
logging.debug("Setting links from %s to %s other RSEs.", srse, len(self.rselist))
for dest in self.rselist:
drse = dest['rse']

if srse == drse or not src_regex.match(srse) or not dst_regex.match(drse):
continue

if (srse in CTA_RSES and drse not in CERN_RSES) or (drse in CTA_RSES and srse not in CERN_RSES):
logging.info("Not setting link from %s to %s", srse, drse)
logging.debug("Not setting link from %s to %s", srse, drse)
continue

count['checked'].append([srse, drse])
Expand All @@ -179,24 +191,21 @@ def update(self, overwrite=False, disable=True, dry=False, srcselect=r'\S+', dst
if srse in self.links and drse in self.links[srse] and self.links[srse][drse] >= 0:
if not link:
pars = {'distance': self.links[srse][drse]}
if dry:
logging.info("adding link from %s to %s with %s. Dry Run", srse, drse, str(pars))
else:
logging.info("ADD link from %s to %s with %s.", srse, drse, str(pars))
if not dry:
self.rcli.add_distance(srse, drse, pars)

count['created'].append([srse, drse])

elif link and overwrite:
if dry:
logging.info("setting distance %s for link from %s to %s. Dry run.",
self.links[srse][drse], srse, drse)
else:
self.rcli.update_distance(srse, drse, {'distance': self.links[srse][drse]})
count['updated'].append([srse, drse])
if link[0]['distance'] != self.links[srse][drse]:
logging.info("SET distance from %s to %s for link from %s to %s.", link[0]['distance'], self.links[srse][drse], srse, drse)
if not dry:
self.rcli.update_distance(srse, drse, {'distance': self.links[srse][drse]})
count['updated'].append([srse, drse])

elif link and disable:
if dry:
logging.info("disabling link from %s to %s. Dry run", srse, drse)
else:
logging.info("DISABLE link from %s to %s.", srse, drse)
if not dry:
self.rcli.update_distance(srse, drse, {'distance': None, })
count['disabled'].append([srse, drse])

Expand Down Expand Up @@ -235,10 +244,12 @@ def update(self, overwrite=False, disable=True, dry=False, srcselect=r'\S+', dst

OPTIONS = PARSER.parse_args()

# Configure logger
# Redirecting stream to stdout so the logs are visible in container logs
if OPTIONS.debug:
logging.basicConfig(level=logging.DEBUG)
logging.basicConfig(stream=sys.stdout, level=logging.DEBUG)
else:
logging.basicConfig(level=logging.INFO)
logging.basicConfig(stream=sys.stdout, level=logging.INFO)

if OPTIONS.exclude:
OPTIONS.exclude = json.loads(OPTIONS.exclude.replace("'", '"'))
Expand Down