Changes to override Rucio storage.json (#4956)

dmwm · Jun 7, 2024 · e3856a8 · e3856a8
1 parent 6c9a92b
commit e3856a8
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 4 deletions.
diff --git a/etc/HIProdOfflineConfiguration.py b/etc/HIProdOfflineConfiguration.py
@@ -45,7 +45,8 @@
 
 addSiteConfig(tier0Config, "T0_CH_CERN_Disk",
                 siteLocalConfig="/cvmfs/cms.cern.ch/SITECONF/T0_CH_CERN/JobConfig/site-local-config.xml",
-                overrideCatalog="T2_CH_CERN,,T0_CH_CERN,CERN_EOS_T0,XRootD"
+                overrideCatalog="T2_CH_CERN,,T0_CH_CERN,CERN_EOS_T0,XRootD",
+                siteLocalRucioConfig="/cvmfs/cms.cern.ch/SITECONF/T0_CH_CERN/storage.json",
                 )
 # Set global parameters:
 #  Acquisition era

diff --git a/etc/HIReplayOfflineConfiguration.py b/etc/HIReplayOfflineConfiguration.py
@@ -48,7 +48,8 @@
 
 addSiteConfig(tier0Config, "T0_CH_CERN_Disk",
                 siteLocalConfig="/cvmfs/cms.cern.ch/SITECONF/T0_CH_CERN/JobConfig/site-local-config.xml",
-                overrideCatalog="T2_CH_CERN,,T0_CH_CERN,CERN_EOS_T0,XRootD"
+                overrideCatalog="T2_CH_CERN,,T0_CH_CERN,CERN_EOS_T0,XRootD",
+                siteLocalRucioConfig="/cvmfs/cms.cern.ch/SITECONF/T0_CH_CERN/storage.json",
                 )
 
 addSiteConfig(tier0Config, "EOS_PILOT",

diff --git a/etc/ProdOfflineConfiguration.py b/etc/ProdOfflineConfiguration.py
@@ -49,7 +49,8 @@
 
 addSiteConfig(tier0Config, "T0_CH_CERN_Disk",
                 siteLocalConfig="/cvmfs/cms.cern.ch/SITECONF/T0_CH_CERN/JobConfig/site-local-config.xml",
-                overrideCatalog="T2_CH_CERN,,T0_CH_CERN,CERN_EOS_T0,XRootD"
+                overrideCatalog="T2_CH_CERN,,T0_CH_CERN,CERN_EOS_T0,XRootD",
+                siteLocalRucioConfig="/cvmfs/cms.cern.ch/SITECONF/T0_CH_CERN/storage.json",
                 )
 
 # Set global parameters:

diff --git a/etc/ReplayOfflineConfiguration.py b/etc/ReplayOfflineConfiguration.py
@@ -52,7 +52,8 @@
 
 addSiteConfig(tier0Config, "T0_CH_CERN_Disk",
                 siteLocalConfig="/cvmfs/cms.cern.ch/SITECONF/T0_CH_CERN/JobConfig/site-local-config.xml",
-                overrideCatalog="T2_CH_CERN,,T0_CH_CERN,CERN_EOS_T0,XRootD"
+                overrideCatalog="T2_CH_CERN,,T0_CH_CERN,CERN_EOS_T0,XRootD",
+                siteLocalRucioConfig="/cvmfs/cms.cern.ch/SITECONF/T0_CH_CERN/storage.json",
                 )
 
 addSiteConfig(tier0Config, "EOS_PILOT",

diff --git a/src/python/T0/RunConfig/RunConfigAPI.py b/src/python/T0/RunConfig/RunConfigAPI.py
@@ -1136,6 +1136,7 @@ def setStorageSite(tier0Config, wmSpec, storagesite):
     """
     site = retrieveSiteConfig(tier0Config, storagesite)
     wmSpec.setTaskEnvironmentVariables({'WMAGENT_SITE_CONFIG_OVERRIDE':site.SiteLocalConfig})
+    wmSpec.setTaskEnvironmentVariables({'WMAGENT_RUCIO_CATALOG_OVERRIDE':site.SiteLocalRucioConfig})
     setWMSpecOverrideCatalog(wmSpec, site)
     for task in wmSpec.getAllTasks():
         for stepName in task.listAllStepNames():

diff --git a/src/python/T0/RunConfig/Tier0Config.py b/src/python/T0/RunConfig/Tier0Config.py
@@ -15,6 +15,7 @@
 | | |        |                                    SITE,SUBSITE,STORAGE_SITE,VOLUME,PROTOCOL
 | | |        |
 | | |        |--> SiteLocalConfig - Path to this site's site local config file
+| | |        |--> SiteLocalRucioConfig - Path to this site's local Rucio storage json file
 | | |
 | | |--> Global - Configuration parameters that do not belong to a particular
 | |       |       stream or dataset and can be applied to an entire run.
@@ -750,6 +751,16 @@ def setSiteLocalConfig(config, siteLocalConfig):
     config.Global.siteLocalConfig = siteLocalConfig
     return
 
+def setSiteLocalRucioConfig(config, siteLocalRucioConfig):
+    """
+    _setSiteLocalRucioConfig_
+
+    Set the site local Rucio config file to use in case override is necessary.
+    """
+    config.Global.siteLocalRucioConfig = siteLocalRucioConfig
+    return
+
+
 def setBulkDataType(config, type):
     """
     _setBulkDataType_
@@ -1081,6 +1092,12 @@ def addSiteConfig(config, siteName, **options):
     else:
         siteConfig.SiteLocalConfig = options.get("siteLocalConfig", "/cvmfs/cms.cern.ch/SITECONF/local/JobConfig/site-local-config.xml")
 
+    if hasattr(siteConfig, "SiteLocalRucioConfig"):
+        siteConfig.SiteLocalRucioConfig = options.get("siteLocalRucioConfig", siteConfig.SiteLocalRucioConfig)
+    else:
+        siteConfig.SiteLocalRucioConfig = options.get("siteLocalRucioConfig", "/cvmfs/cms.cern.ch/SITECONF/local/storage.json")
+
+
     return
 
 def addRegistrationConfig(config, streamName, **options):