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 64001a2b0e2..11ece8f949b 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/HowTo/dedicateddfc.rst b/docs/source/AdministratorGuide/HowTo/dedicateddfc.rst index 5f43bc2dc5a..6ad460f09f5 100644 --- a/docs/source/AdministratorGuide/HowTo/dedicateddfc.rst +++ b/docs/source/AdministratorGuide/HowTo/dedicateddfc.rst @@ -14,7 +14,7 @@ Prepare the CS for the new Database ------------------------------------ First the information for the new database is added to the Configuration System. All the parameters in the -``Systems/DataManagement//Databases/NFCDB`` section can be copied from the ``FileCatalogDB`` section, except that +``Systems/DataManagement/Databases/NFCDB`` section can be copied from the ``FileCatalogDB`` section, except that the ``DBName`` has to be pointing to the soon to be created database:: DBName = NFCDB diff --git a/docs/source/AdministratorGuide/HowTo/multiVO.rst b/docs/source/AdministratorGuide/HowTo/multiVO.rst index 20e2990ea56..5d8c05e75da 100644 --- a/docs/source/AdministratorGuide/HowTo/multiVO.rst +++ b/docs/source/AdministratorGuide/HowTo/multiVO.rst @@ -213,7 +213,7 @@ Option value could be different, it depends on UI installed on server :: - Systems/WorkloadManagement//Agents/PilotStatusAgent/GridEnv = /etc/profile.d/grid-env + Systems/WorkloadManagement/Agents/PilotStatusAgent/GridEnv = /etc/profile.d/grid-env diff --git a/docs/source/AdministratorGuide/Resources/supercomputers.rst b/docs/source/AdministratorGuide/Resources/supercomputers.rst index def98694c1d..0af37911cb4 100644 --- a/docs/source/AdministratorGuide/Resources/supercomputers.rst +++ b/docs/source/AdministratorGuide/Resources/supercomputers.rst @@ -112,7 +112,7 @@ Solutions seen in the previous section cannot work in an environment without ext The well-known Pilot-Job paradigm on which the DIRAC WMS is based does not apply in these circumstances: the Pilot-Jobs cannot fetch jobs from DIRAC. Thus, such supercomputers require slightly changes in the WMS: we reintroduced the push model. -To leverage the Push model, one has to add the :mod:`~DIRAC.WorkloadManagementSystem.Agent.PushJobAgent` to the ``Systems/WorkloadManagement//Agents`` CS section, such as:: +To leverage the Push model, one has to add the :mod:`~DIRAC.WorkloadManagementSystem.Agent.PushJobAgent` to the ``Systems/WorkloadManagement/Agents`` CS section, such as:: Systems PushJobAgent_ diff --git a/docs/source/AdministratorGuide/Systems/MonitoringSystem/index.rst b/docs/source/AdministratorGuide/Systems/MonitoringSystem/index.rst index 64ef23d631f..fb47e86057e 100644 --- a/docs/source/AdministratorGuide/Systems/MonitoringSystem/index.rst +++ b/docs/source/AdministratorGuide/Systems/MonitoringSystem/index.rst @@ -55,7 +55,7 @@ For example:: } -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 indices are prefixed with the setup name. @@ -93,7 +93,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/AdministratorGuide/Systems/WorkloadManagement/architecture.rst b/docs/source/AdministratorGuide/Systems/WorkloadManagement/architecture.rst index e3b56fe06dd..903d9663e97 100644 --- a/docs/source/AdministratorGuide/Systems/WorkloadManagement/architecture.rst +++ b/docs/source/AdministratorGuide/Systems/WorkloadManagement/architecture.rst @@ -30,7 +30,7 @@ All the DBs above are MySQL DBs, and should be installed using the :ref:`system The JobDB MySQL table *JobParameters* can be replaced by an JobParameters backend built in Elastic/OpenSearch. To enable it, set the following flag:: - /Operations/[Defaults | Setup]/Services/JobMonitoring/useESForJobParametersFlag=True + /Operations/Defaults/Services/JobMonitoring/useESForJobParametersFlag=True If you decide to make use of this Elastic/OpenSearch backend for storing job parameters, you would be in charge of setting the index policies, as Job Parameters stored in Elastic/OpenSearch are not deleted together with the jobs. 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/FrameworkSystem/Client/SystemAdministratorClientCLI.py b/src/DIRAC/FrameworkSystem/Client/SystemAdministratorClientCLI.py index be7246baf91..eb8ccc8b3ea 100644 --- a/src/DIRAC/FrameworkSystem/Client/SystemAdministratorClientCLI.py +++ b/src/DIRAC/FrameworkSystem/Client/SystemAdministratorClientCLI.py @@ -1088,7 +1088,7 @@ def do_update(self, args): else: gLogger.notice("Software successfully updated.") gLogger.notice("You should restart the services to use the new software version.") - gLogger.notice("Think of updating /Operations///Pilot/Versions section in the CS") + gLogger.notice("Think of updating /Operations//Pilot/Versions section in the CS") def do_revert(self, args): """ diff --git a/src/DIRAC/MonitoringSystem/DB/MonitoringDB.py b/src/DIRAC/MonitoringSystem/DB/MonitoringDB.py index bc96a123a38..2e57adf4611 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 180c75a9412..39354ec45f4 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 428ddab87c2..f769bc534a0 100644 --- a/src/DIRAC/WorkloadManagementSystem/Utilities/PilotCStoJSONSynchronizer.py +++ b/src/DIRAC/WorkloadManagementSystem/Utilities/PilotCStoJSONSynchronizer.py @@ -270,7 +270,7 @@ def syncScripts(self): 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")