Merge pull request DIRACGrid#8284 from chaen/v9.0_feat_forceSuccessfulCSSync

[9.0]  force successful sync of remote CS for Agent

Author: chrisburr

src/DIRAC/ConfigurationSystem/Client/LocalConfiguration.py

@@ -1,5 +1,5 @@
-""" This is the guy that parses and interprets the local configuration options.
-"""
+"""This is the guy that parses and interprets the local configuration options."""
+
 import re
 import os
 import sys
@@ -286,16 +286,18 @@ def __checkMandatoryOptions(self):
             gLogger.exception()
             return S_ERROR(str(e))
 
-    def initialize(self, *, returnErrors=False):
+    def initialize(self, *, returnErrors=False, requireSuccessfulSync=False):
         """Entrypoint used by :py:class:`DIRAC.initialize`
 
+        :param requireSuccessfulSync: fails if syncing with the remote did not work
+
         TODO: This is currently a hack that returns a list of errors for so it
         can be used by ``__addUserDataToConfiguration``. This entire module
         should be refactored and simplified with ``Script.parseCommandLine``.
         """
         errorsList = self.__loadCFGFiles()
         if gConfigurationData.getServers():
-            retVal = self.syncRemoteConfiguration()
+            retVal = self.syncRemoteConfiguration(strict=requireSuccessfulSync)
             if not retVal["OK"]:
                 return retVal
         else:
@@ -321,22 +323,23 @@ def __initLogger(self, componentName, logSection, forceInit=False):
             gLogger.showHeaders(True)
             gLogger.enableLogsFromExternalLibs()
 
-    def loadUserData(self):
+    def loadUserData(self, requireSuccessfulSync=False):
         """
         This is the magic method that reads the command line and processes it
         It is used by the Script Base class and the dirac-service and dirac-agent scripts
         Before being called:
         - any additional switches to be processed
         - mandatory and default configuration configuration options must be defined.
 
+        :param requireSuccessfulSync: if True, will fail if the sync with remote server failed
         """
         if self.initialized:
             return S_OK()
         self.initialized = True
         try:
             if not self.isParsed:
                 self.__parseCommandLine()  # Parse command line
-            retVal = self.__addUserDataToConfiguration()
+            retVal = self.__addUserDataToConfiguration(requireSuccessfulSync=requireSuccessfulSync)
 
             for optionTuple in self.optionalEntryList:
                 optionPath = self.__getAbsolutePath(optionTuple[0])
@@ -496,8 +499,8 @@ def __loadCFGFiles(self):
 
         return errorsList
 
-    def __addUserDataToConfiguration(self):
-        retVal = self.initialize(returnErrors=True)
+    def __addUserDataToConfiguration(self, requireSuccessfulSync=False):
+        retVal = self.initialize(returnErrors=True, requireSuccessfulSync=requireSuccessfulSync)
         if not retVal["OK"]:
             return retVal
         errorsList = retVal["Value"]

src/DIRAC/Core/scripts/dirac_agent.py

@@ -25,7 +25,7 @@ def main():
     localCfg.setConfigurationForAgent(agentName)
     localCfg.addDefaultEntry("/DIRAC/Security/UseServerCertificate", "yes")
     localCfg.addDefaultEntry("LogColor", True)
-    resultDict = localCfg.loadUserData()
+    resultDict = localCfg.loadUserData(requireSuccessfulSync=True)
     if not resultDict["OK"]:
         gLogger.error("There were errors when loading configuration", resultDict["Message"])
         sys.exit(1)

src/DIRAC/__init__.py

@@ -1,59 +1,60 @@
 """
-   DIRAC - Distributed Infrastructure with Remote Agent Control
-
-   The distributed data production and analysis system of LHCb and other VOs.
-
-   DIRAC is a software framework for distributed computing which
-   allows to integrate various computing resources in a single
-   system. At the same time it integrates all kinds of computing
-   activities like Monte Carlo simulations, data processing, or
-   final user analysis.
-
-   It is build as number of cooperating systems:
-    - Accounting
-    - Configuration
-    - Core
-      - Base
-      - Security
-      - Utilities
-      - Workflow
-    - Framework
-    - RequestManagement
-    - Resources
-    - Transformation
-
-    Which are used by other system providing functionality to
-    the end user:
-    - DataManagement
-    - Interfaces
-    - ResourceStatus
-    - StorageManagement
-    - WorkloadManagement
-
-    It defines the following data members:
-    - version:       DIRAC version string
-
-    - errorMail:     mail address for important errors
-    - alarmMail:     mail address for important alarms
-
-    It loads Modules from :
-    - DIRAC.Core.Utililies
-
-    It loads:
-    - S_OK:           OK return structure
-    - S_ERROR:        ERROR return structure
-    - gLogger:        global Logger object
-    - gConfig:        global Config object
-
-    It defines the following functions:
-    - abort:          aborts execution
-    - exit:           finish execution using callbacks
-    - siteName:       returns DIRAC name for current site
-
-    - getPlatform():      DIRAC platform string for current host
-    - getPlatformTuple(): DIRAC platform tuple for current host
+DIRAC - Distributed Infrastructure with Remote Agent Control
+
+The distributed data production and analysis system of LHCb and other VOs.
+
+DIRAC is a software framework for distributed computing which
+allows to integrate various computing resources in a single
+system. At the same time it integrates all kinds of computing
+activities like Monte Carlo simulations, data processing, or
+final user analysis.
+
+It is build as number of cooperating systems:
+ - Accounting
+ - Configuration
+ - Core
+   - Base
+   - Security
+   - Utilities
+   - Workflow
+ - Framework
+ - RequestManagement
+ - Resources
+ - Transformation
+
+ Which are used by other system providing functionality to
+ the end user:
+ - DataManagement
+ - Interfaces
+ - ResourceStatus
+ - StorageManagement
+ - WorkloadManagement
+
+ It defines the following data members:
+ - version:       DIRAC version string
+
+ - errorMail:     mail address for important errors
+ - alarmMail:     mail address for important alarms
+
+ It loads Modules from :
+ - DIRAC.Core.Utililies
+
+ It loads:
+ - S_OK:           OK return structure
+ - S_ERROR:        ERROR return structure
+ - gLogger:        global Logger object
+ - gConfig:        global Config object
+
+ It defines the following functions:
+ - abort:          aborts execution
+ - exit:           finish execution using callbacks
+ - siteName:       returns DIRAC name for current site
+
+ - getPlatform():      DIRAC platform string for current host
+ - getPlatformTuple(): DIRAC platform tuple for current host
 
 """
+
 import importlib.metadata
 import os
 import re
@@ -237,7 +238,7 @@ def initialize(
         log_level = getattr(LogLevel, gLogger.getLevel())
         gLogger.setLevel(LogLevel.ALWAYS)
     try:
-        returnValueOrRaise(localCfg.initialize())
+        returnValueOrRaise(localCfg.initialize(requireSuccessfulSync=require_auth))
     finally:
         # Restore the pre-existing log level
         gLogger.setLevel(log_level)