From c51fd8e5d571b7acb40873c4338fe5204057b09d Mon Sep 17 00:00:00 2001 From: Federico Stagni Date: Thu, 16 Jan 2025 15:10:50 +0100 Subject: [PATCH] sweep: #7991 docs: updates for setup removals --- .../ConfReference/Operations/JobScheduling/index.rst | 4 ++-- .../Configuration/ConfReference/Operations/Pilots/index.rst | 2 +- .../Configuration/ConfReference/Systems/index.rst | 2 +- .../AdministratorGuide/Systems/MonitoringSystem/index.rst | 2 +- .../Systems/WorkloadManagement/JobsPriorities.rst | 4 ++-- .../Utilities/CSHelpers/Operations/index.rst | 4 ++-- .../DeveloperGuide/Internals/Core/componentsAuthNandAuthZ.rst | 2 +- src/DIRAC/MonitoringSystem/DB/MonitoringDB.py | 2 +- src/DIRAC/Resources/Storage/CTAStorage.py | 2 +- src/DIRAC/WorkloadManagementSystem/DB/JobDB.py | 2 +- .../Utilities/PilotCStoJSONSynchronizer.py | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-) diff --git a/docs/source/AdministratorGuide/Configuration/ConfReference/Operations/JobScheduling/index.rst b/docs/source/AdministratorGuide/Configuration/ConfReference/Operations/JobScheduling/index.rst index 13a8d6098b1..101f119460f 100644 --- a/docs/source/AdministratorGuide/Configuration/ConfReference/Operations/JobScheduling/index.rst +++ b/docs/source/AdministratorGuide/Configuration/ConfReference/Operations/JobScheduling/index.rst @@ -4,7 +4,7 @@ Job Scheduling ========================================= -The */Operations///JobScheduling* section contains all parameters that define DIRAC's behaviour when deciding what job has to be +The */Operations//JobScheduling* section contains all parameters that define DIRAC's behaviour when deciding what job has to be executed. Here's a list of parameters that can be defined: ========================= ======================================================== =============================================================================================== @@ -46,7 +46,7 @@ Example ======== An example with all the options under *JobScheduling* follows. Remember that JobScheduling is defined under -*/Operations///JobScheduling* for multi-VO installations, and */Operations//JobScheduling* for single-VO ones:: +*/Operations//JobScheduling* for multi-VO installations, and */Operations/JobScheduling* for single-VO ones:: JobScheduling { diff --git a/docs/source/AdministratorGuide/Configuration/ConfReference/Operations/Pilots/index.rst b/docs/source/AdministratorGuide/Configuration/ConfReference/Operations/Pilots/index.rst index 419bbc2de0e..6e4902c43f3 100644 --- a/docs/source/AdministratorGuide/Configuration/ConfReference/Operations/Pilots/index.rst +++ b/docs/source/AdministratorGuide/Configuration/ConfReference/Operations/Pilots/index.rst @@ -2,7 +2,7 @@ Pilot version ========================================= -The */Operations///Pilot* section define What version of DIRAC will be used to submit pilot jobs to the resources. +The */Operations//Pilot* section define What version of DIRAC will be used to submit pilot jobs to the resources. ================== ======================================================== =============================================================================================== Parameter Description Default value diff --git a/docs/source/AdministratorGuide/Configuration/ConfReference/Systems/index.rst b/docs/source/AdministratorGuide/Configuration/ConfReference/Systems/index.rst index 98caa79a046..17237cbd36f 100644 --- a/docs/source/AdministratorGuide/Configuration/ConfReference/Systems/index.rst +++ b/docs/source/AdministratorGuide/Configuration/ConfReference/Systems/index.rst @@ -43,7 +43,7 @@ For this reason, there is the possibility to define a entry in the Operation sec .. code-block:: guess - Operations//MainServers = server1, server2 + Operations/MainServers = server1, server2 There should be no port, no protocol. In the system configuration, one can then write: diff --git a/docs/source/AdministratorGuide/Systems/MonitoringSystem/index.rst b/docs/source/AdministratorGuide/Systems/MonitoringSystem/index.rst index 67248a085c2..53133c20ff8 100644 --- a/docs/source/AdministratorGuide/Systems/MonitoringSystem/index.rst +++ b/docs/source/AdministratorGuide/Systems/MonitoringSystem/index.rst @@ -92,7 +92,7 @@ This can be done either via the CS or directly in the web app in the Configurati Operations { - + { MonitoringBackends { diff --git a/docs/source/AdministratorGuide/Systems/WorkloadManagement/JobsPriorities.rst b/docs/source/AdministratorGuide/Systems/WorkloadManagement/JobsPriorities.rst index 6d0f2946adb..5aee9a18914 100644 --- a/docs/source/AdministratorGuide/Systems/WorkloadManagement/JobsPriorities.rst +++ b/docs/source/AdministratorGuide/Systems/WorkloadManagement/JobsPriorities.rst @@ -93,8 +93,8 @@ DIRAC includes a priority correction mechanism. The idea behind it is to look at the past history and alter the priorities assigned based on it. It can have multiple plugins but currently it only has one. All correctors have a CS section to configure themselves under -`/Operations///JobScheduling/ShareCorrections`. The option -`/Operations///JobScheduling/ShareCorrections/ShareCorrectorsToStart` +`/Operations//JobScheduling/ShareCorrections`. The option +`/Operations//JobScheduling/ShareCorrections/ShareCorrectorsToStart` defines witch correctors will be used in each iteration. WMSHistory corrector diff --git a/docs/source/DeveloperGuide/AddingNewComponents/Utilities/CSHelpers/Operations/index.rst b/docs/source/DeveloperGuide/AddingNewComponents/Utilities/CSHelpers/Operations/index.rst index 8cfe5c32ee5..e35093e0d80 100644 --- a/docs/source/DeveloperGuide/AddingNewComponents/Utilities/CSHelpers/Operations/index.rst +++ b/docs/source/DeveloperGuide/AddingNewComponents/Utilities/CSHelpers/Operations/index.rst @@ -4,8 +4,8 @@ Helper for accessing /Operations */Operations* section is *VO* and *setup* aware. That means that configuration for different *VO/setup* will have a different CS path: - * For multi-VO installations */Operations//* should be used. - * For single-VO installations */Operations/* should be used. + * For multi-VO installations */Operations/* should be used. + * For single-VO installations */Operations* should be used. In any case, there is the possibility to define a default configuration, that is valid for all the *setups*. The *Defaults* keyword can be used instead of the setup. For instance */Operations/myvo/Defaults*. diff --git a/docs/source/DeveloperGuide/Internals/Core/componentsAuthNandAuthZ.rst b/docs/source/DeveloperGuide/Internals/Core/componentsAuthNandAuthZ.rst index 5fe8a12bb5a..321f47df620 100644 --- a/docs/source/DeveloperGuide/Internals/Core/componentsAuthNandAuthZ.rst +++ b/docs/source/DeveloperGuide/Internals/Core/componentsAuthNandAuthZ.rst @@ -10,7 +10,7 @@ for authentication and authorization purposes. Components can be instructed to use a "shifter proxy" for authN and authZ of their service calls. A shifter proxy is proxy certificate, which should be: -- specified in the "Operations//Shifter" section of the CS +- specified in the "Operations/Shifter" section of the CS - uploaded to the ProxyManager (i.e. using "--upload" option of dirac-proxy-init) Within an agent, in the "initialize" method, we can specify:: diff --git a/src/DIRAC/MonitoringSystem/DB/MonitoringDB.py b/src/DIRAC/MonitoringSystem/DB/MonitoringDB.py index c86c985cf30..bce2bba76a8 100644 --- a/src/DIRAC/MonitoringSystem/DB/MonitoringDB.py +++ b/src/DIRAC/MonitoringSystem/DB/MonitoringDB.py @@ -3,7 +3,7 @@ **Configuration Parameters**: -The following option can be set in `Systems/Monitoring//Databases/MonitoringDB` +The following option can be set in `Systems/Monitoring/Databases/MonitoringDB` * *IndexPrefix*: Prefix used to prepend to indexes created in the ES instance. If this is not present in the CS, the indexes are prefixed with the setup name. diff --git a/src/DIRAC/Resources/Storage/CTAStorage.py b/src/DIRAC/Resources/Storage/CTAStorage.py index 39aa7d32932..686d3bf0560 100644 --- a/src/DIRAC/Resources/Storage/CTAStorage.py +++ b/src/DIRAC/Resources/Storage/CTAStorage.py @@ -10,7 +10,7 @@ class CTAStorage(GFAL2_XROOTStorage): It basically is XROOT with added tape capabilities. Since CTA supports ONLY xroot, do not forget to add - xroot in your `Operations//DataManagement/RegistrationProtocols` list + xroot in your `Operations/DataManagement/RegistrationProtocols` list Configuration example:: diff --git a/src/DIRAC/WorkloadManagementSystem/DB/JobDB.py b/src/DIRAC/WorkloadManagementSystem/DB/JobDB.py index 6c3c18574b3..d1391da4288 100755 --- a/src/DIRAC/WorkloadManagementSystem/DB/JobDB.py +++ b/src/DIRAC/WorkloadManagementSystem/DB/JobDB.py @@ -5,7 +5,7 @@ **Configuration Parameters**: -The following options can be set in ``Systems/WorkloadManagement//Databases/JobDB`` +The following options can be set in ``Systems/WorkloadManagement/Databases/JobDB`` * *MaxRescheduling*: Set the maximum number of times a job can be rescheduled, default *3*. * *CompressJDLs*: Enable compression of JDLs when they are stored in the database, default *False*. diff --git a/src/DIRAC/WorkloadManagementSystem/Utilities/PilotCStoJSONSynchronizer.py b/src/DIRAC/WorkloadManagementSystem/Utilities/PilotCStoJSONSynchronizer.py index 12e912c0382..d2e3fa5a984 100644 --- a/src/DIRAC/WorkloadManagementSystem/Utilities/PilotCStoJSONSynchronizer.py +++ b/src/DIRAC/WorkloadManagementSystem/Utilities/PilotCStoJSONSynchronizer.py @@ -180,7 +180,7 @@ def syncScripts(self) -> DOKReturnType[Any]: for fileVO in glob.glob(scriptDir): tarFiles.append(fileVO) else: - self.log.info("The /Operations//Pilot/pilotVORepo option is not defined, using Vanilla DIRAC pilot") + self.log.info("The /Operations/Pilot/pilotVORepo option is not defined, using Vanilla DIRAC pilot") # DIRAC repo pilotLocalRepo = os.path.join(self.workDir, "pilotLocalRepo")