Add PoC creation for _User sites

docker/rucio_client/scripts/CMSRSE.py

@@ -30,6 +30,10 @@
         'wan': {'read': 1, 'write': 1, 'third_party_copy_write': 1, 'third_party_copy_read': 1,
                 'delete': 1},
         'lan': {'read': None, 'write': None, 'delete': None}},
+    'user': {
+        'wan': {'read': 1, 'write': 1, 'third_party_copy_write': 1, 'third_party_copy_read': 1,
+                'delete': 1},
+        'lan': {'read': None, 'write': None, 'delete': None}},
 }
 RUCIO_PROTOS = ['SRMv2', 'XRootD', 'WebDAV']
 PROTO_WEIGHT_TPC = {'WebDAV': 1, 'XRootD': 3, 'SRMv2': 2}
@@ -64,11 +68,13 @@ def __init__(self, json, dry=False, cms_type='real', deterministic=True):
 
         xattrs = {}
 
-        # If we are building a _Test or _Temp instance add the special prefix
+        # If we are building a _Test, _Temp, or _User instance add the special suffix
         if cms_type == "test":
             self.rse_name = json['rse']+"_Test"
         elif cms_type == "temp":
             self.rse_name = json['rse']+"_Temp"
+        elif cms_type == "user":
+            self.rse_name = json['rse']+"_User"
         else:
             self.rse_name = json['rse']
             if json.get('loadtest', None) is not None:

docker/rucio_client/scripts/setOneRucioFromGitlab

@@ -15,7 +15,7 @@ import logging
 import sys
 
 parser = ArgumentParser(description="Update a site definition from GitLab")
-parser.add_argument('--type', dest='cms_type', help='type of RSE (prod-real, int-real, test, temp).',default=None, required=True)
+parser.add_argument('--type', dest='cms_type', help='type of RSE (prod-real, int-real, test, temp, user).',default=None, required=True)
 parser.add_argument('--dryrun', dest='dry_run', action='store_true')
 parser.add_argument('--debug', action='store_true', help='be more verbose')
 parser.add_argument('--just_print', dest='print_scheme', help='just prints the given scheme: gsiftp, srm, davs, xroot, all', \

docker/rucio_client/scripts/setRucioFromGitlab

@@ -14,8 +14,11 @@ from CMSRSE import CMSRSE
 
 SKIP_SITES = []
 
+# PoC hardcoded list of RSE names for which _User variants should be created
+USER_TIER_POC_SITES = ['T2_IT_Rome']
+
 parser = ArgumentParser(description="Update a site definition from GitLab")
-parser.add_argument('--type', dest='cms_type', help='type of RSE (prod-real, int-real, test, temp).',
+parser.add_argument('--type', dest='cms_type', help='type of RSE (prod-real, int-real, test, temp, user).',
                     default=None, required=True)
 parser.add_argument('--dryrun', dest='dry_run', action='store_true',
                     help='do not change anything in rucio, checking only')
@@ -59,7 +62,7 @@ for project in projects:
                 continue
             print(f'Checking {site["rse"]} and type {options.cms_type}')
             if site['rse'] and options.cms_type in ['test', 'temp']:
-                # For these, query the actual site and construct a JSON
+                # For test and temp types, apply to all RSEs
                 if options.cms_type == 'test':
                     rse_name = site['rse'] + '_Test'
                     deterministic = True
@@ -70,8 +73,27 @@ for project in projects:
                     print(' Skipping.')
                     continue
 
-                if 'fts' not in site:
-                    site.update({'fts': ["https://fts3-cms.cern.ch:8446", "https://lcgfts3.gridpp.rl.ac.uk:8446"]})
+                rse = CMSRSE(site, dry=options.dry_run, cms_type=options.cms_type, deterministic=deterministic)
+                try:
+                    if rse.update():
+                        print(f'RSE {rse.rse_name} and type {rse.rucio_rse_type} changed')
+                    else:
+                        print(f'RSE {rse.rse_name} and type {rse.rucio_rse_type} unchanged')
+                except Exception:
+                    print(f'Could not update RSE {rse.rse_name}. Traceback:')
+                    print(traceback.format_exc())
+            elif site['rse'] and options.cms_type == 'user':
+                # For user type, only create _User variants for PoC sites
+                if site['rse'] not in USER_TIER_POC_SITES:
+                    print(f' Skipping (not in PoC list: {USER_TIER_POC_SITES})')
+                    continue
+                # For these, query the actual site and construct a JSON
+                rse_name = site['rse'] + '_User'
+                deterministic = True
+                if rse_name in SKIP_SITES or not DO_SITES or rse_name not in DO_SITES:
+                    print(' Skipping.')
+                    continue
+
                 rse = CMSRSE(site, dry=options.dry_run, cms_type=options.cms_type, deterministic=deterministic)
                 try:
                     if rse.update():

docker/rucio_client/scripts/setSiteCapacity

@@ -152,10 +152,16 @@ try:
         logger.debug(f"Updating static usage for {rse}")
         disk_experiment_use_bytes = site['disk_experiment_use'] * 1e12 #total space used by CMS experiment data
         disk_local_use_bytes = site['disk_local_use'] * 1e12 #additional quota for local rse_local_users account
-        rse_available_bytes = disk_experiment_use_bytes + disk_local_use_bytes
+
+        # For _User suffix RSEs, the entire capacity comes from disk_local_use
+        if rse.endswith('_User'):
+            rse_available_bytes = disk_local_use_bytes
+        else:
+            rse_available_bytes = disk_experiment_use_bytes + disk_local_use_bytes
 
-        # Set Quota for local users account for the rse
-        setLocalUsersQuota(rclient, group_accounts, rse, disk_local_use_bytes, logger, dry_run)
+        # Set Quota for local users account for the rse (skip for _User suffix RSEs)
+        if not rse.endswith('_User'):
+            setLocalUsersQuota(rclient, group_accounts, rse, disk_local_use_bytes, logger, dry_run)
 
         min_free_space_percentage = default_min_free_space_percentage
         rse_attributes = rclient.list_rse_attributes(rse=rse)
@@ -166,7 +172,13 @@ try:
 
         try:
             # Static usage is 0 for many T3s - These are managed as quasi-static
-            if disk_experiment_use_bytes == 0:
+            # For _User suffix RSEs, check disk_local_use instead of disk_experiment_use
+            if rse.endswith('_User'):
+                skip_check = disk_local_use_bytes == 0
+            else:
+                skip_check = disk_experiment_use_bytes == 0
+
+            if skip_check:
                 logger.debug(f"Static usage for {rse} is 0, skipping")
                 continue