DIRAC 9.0.0a64__tar.gz → 9.0.0a67__tar.gz

{dirac-9.0.0a64/src/DIRAC.egg-info → dirac-9.0.0a67}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: DIRAC
-Version: 9.0.0a64
+Version: 9.0.0a67
 Summary: DIRAC is an interware, meaning a software framework for distributed computing.
 Home-page: https://github.com/DIRACGrid/DIRAC/
 License: GPL-3.0-only
@@ -19,6 +19,7 @@ Requires-Dist: cachetools
 Requires-Dist: certifi
 Requires-Dist: cwltool
 Requires-Dist: diraccfg
+Requires-Dist: DIRACCommon==v9.0.0a67
 Requires-Dist: diracx-client>=v0.0.1a18
 Requires-Dist: diracx-core>=v0.0.1a18
 Requires-Dist: db12

{dirac-9.0.0a64 → dirac-9.0.0a67}/environment.yml

@@ -108,5 +108,6 @@ dependencies:
     # It should eventually be part of DIRACGrid
     - git+https://github.com/DIRACGrid/tornado_m2crypto
     - -e .[server]
+    - -e ./dirac-common/
     # Add diracdoctools
     - -e docs/

{dirac-9.0.0a64 → dirac-9.0.0a67}/integration_tests.py

@@ -39,7 +39,9 @@ FEATURE_VARIABLES = {
     "INSTALLATION_BRANCH": "",
     "DEBUG": "Yes",
 }
-DEFAULT_MODULES = {"DIRAC": Path(__file__).parent.absolute()}
+DEFAULT_MODULES = {
+    "DIRAC": Path(__file__).parent.absolute(),
+}
 # All services that have a FutureClient, but we *explicitly* deactivate
 # (for example if we did not finish to develop it)
 DIRACX_DISABLED_SERVICES = [

{dirac-9.0.0a64 → dirac-9.0.0a67}/release.notes

@@ -1,3 +1,67 @@
+[v9.0.0a67]
+
+*DataManagementSystem
+
+NEW: (#8293) Add composite indices on (lastUpdate, assignment) for both Jobs and Operations tables in FTS3DB
+
+*Test
+
+CHANGE: (#8292) Speed up CI/pytest runtime
+
+*Core
+
+CHANGE: (#8290) Move TimeUtilities to DIRACCommon
+CHANGE: (#8290) Move StateMachine to DIRACCommon
+CHANGE: (#8290) Move JDL utilities to DIRACCommon
+CHANGE: (#8290) Move List utilities to DIRACCommon
+CHANGE: (#8289) Move ClassAdLight to DIRACCommon
+
+*WorkloadManagement
+
+CHANGE: (#8290) Move JobStatus to DIRACCommon
+CHANGE: (#8290) Move JobsStateMachine to DIRACCommon
+CHANGE: (#8290) Move JobStatusUtility to DIRACCommon
+CHANGE: (#8290) Move JobManifest to DIRACCommon
+CHANGE: (#8290) Move JobDBUtils to DIRACCommon
+FIX: (#8290) Correctly update JDL defaults when CS changes
+
+*Workload Management
+
+CHANGE: (#8289) Move JobDBUtilsto DIRACCommon
+CHANGE: (#8289) Move ParametricJob to DIRACCommon
+
+*Configuration/Core
+
+NEW: (#8288) Included a VO (using top level groups as VO) option when getting user subjects from IAM. Behaviour with single VO IAM should be unchanged.
+
+Address GHSA-mm38-q5fj-99j4
+
+*RucioFileCatalogClient
+
+FIX
+Remove some potentially Sensitive Information (DN, account)
+
+[v9.0.0a66]
+[v9.0.0a65]
+
+*Core
+
+NEW: (#8287) DIRACCommon package containing stateless utilities extracted from DIRAC. This allows external projects like DiracX to use DIRAC's S_OK/S_ERROR return values and error codes without importing DIRAC and triggering global state initialization. The package maintains full backward compatibility - all existing imports continue to work unchanged.
+
+*ConfigurationSystem
+
+CHANGE: (#8284) force successful sync of remote CS for agents
+
+*WorkloadManagementSystem
+
+FIX: (#8283) Do not import DB at the top of the utility module
+
+Please follow the template:
+
+*Integration Tests
+
+NEW: (#8281) Add diracx logs into DIRAC CI
+
 [v9.0.0a64]
 
 *WorkloadManagement

{dirac-9.0.0a64 → dirac-9.0.0a67}/setup.cfg

@@ -26,6 +26,7 @@ install_requires =
 	certifi
 	cwltool
 	diraccfg
+	DIRACCommon==v9.0.0a67
 	diracx-client >=v0.0.1a18
 	diracx-core >=v0.0.1a18
 	db12

{dirac-9.0.0a64 → dirac-9.0.0a67}/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 @@ class LocalConfiguration:
             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,7 +323,7 @@ class LocalConfiguration:
             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
@@ -329,6 +331,7 @@ class LocalConfiguration:
         - 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()
@@ -336,7 +339,7 @@ class LocalConfiguration:
         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 @@ class LocalConfiguration:
 
         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"]

{dirac-9.0.0a64 → dirac-9.0.0a67}/src/DIRAC/ConfigurationSystem/Client/VOMS2CSSynchronizer.py

@@ -594,7 +594,7 @@ class VOMS2CSSynchronizer:
 
         # Try to fill in the DiracX section
         if self.useIAM:
-            iam_subs = self.iamSrv.getUsersSub()
+            iam_subs = self.iamSrv.getUsersSub(self.vo)
             diracx_vo_config = {"DiracX": {"CsSync": {"VOs": {self.vo: {"UserSubjects": iam_subs}}}}}
             iam_sub_cfg = CFG()
             iam_sub_cfg.loadFromDict(diracx_vo_config)

{dirac-9.0.0a64 → dirac-9.0.0a67}/src/DIRAC/Core/Security/IAMService.py

@@ -144,7 +144,7 @@ class IAMService:
         result = S_OK({"Users": users, "Errors": errors})
         return result
 
-    def getUsersSub(self) -> dict[str, str]:
+    def getUsersSub(self, vo=None) -> dict[str, str]:
         """
         Return the mapping based on IAM sub:
         {nickname : sub}
@@ -152,6 +152,7 @@ class IAMService:
         iam_users_raw = self._getIamUserDump()
         diracx_user_section = {}
         for user_info in iam_users_raw:
+            userGroups = [grp["display"] for grp in user_info.get("groups", [])]
             # The nickname is available in the list of attributes
             # (if configured so)
             # in the form {'name': 'nickname', 'value': 'chaen'}
@@ -165,8 +166,8 @@ class IAMService:
             except (KeyError, IndexError):
                 nickname = user_info["userName"]
             sub = user_info["id"]
-
-            diracx_user_section[nickname] = sub
+            if not vo or vo in userGroups:
+                diracx_user_section[nickname] = sub
         # reorder it
         diracx_user_section = dict(sorted(diracx_user_section.items()))
 

dirac-9.0.0a67/src/DIRAC/Core/Utilities/ClassAd/ClassAdLight.py

@@ -0,0 +1,9 @@
+""" ClassAd Class - a light purely Python representation of the
+    Condor ClassAd library.
+"""
+
+# Import from DIRACCommon for backward compatibility
+from DIRACCommon.Core.Utilities.ClassAd.ClassAdLight import ClassAd
+
+# Re-export for backward compatibility
+__all__ = ["ClassAd"]

dirac-9.0.0a67/src/DIRAC/Core/Utilities/DErrno.py

@@ -0,0 +1,77 @@
+""" :mod: DErrno
+
+    ==========================
+
+    .. module: DErrno
+
+    :synopsis: Error list and utilities for handling errors in DIRAC
+
+
+    This module contains list of errors that can be encountered in DIRAC.
+    It complements the errno module of python.
+
+    It also contains utilities to manipulate these errors.
+
+    Finally, it contains a DErrno class that contains an error number
+    as well as a low level error message. It behaves like a string for
+    compatibility reasons
+
+    In order to add extension specific error, you need to create in your extension the file
+    Core/Utilities/DErrno.py, which will contain the following dictionary:
+
+      * extra_dErrName: keys are the error name, values the number of it
+      * extra_dErrorCode: same as dErrorCode. keys are the error code, values the name
+                          (we don't simply revert the previous dict in case we do not
+                          have a one to one mapping)
+      * extra_dStrError: same as dStrError, Keys are the error code, values the error description
+      * extra_compatErrorString: same as compatErrorString. The compatible error strings are
+                                 added to the existing one, and not replacing them.
+
+
+    Example of extension file :
+
+       * extra_dErrName = { 'ELHCBSPE' : 3001 }
+       * extra_dErrorCode = { 3001 : 'ELHCBSPE'}
+       * extra_dStrError = { 3001 : "This is a description text of the specific LHCb error" }
+       * extra_compatErrorString = { 3001 : ["living easy, living free"],
+                             DErrno.ERRX : ['An error message for ERRX that is specific to LHCb']}
+
+"""
+import importlib
+import sys
+
+# Import all the stateless parts from DIRACCommon
+from DIRACCommon.Core.Utilities.DErrno import *  # noqa: F401, F403
+
+from DIRAC.Core.Utilities.Extensions import extensionsByPriority
+
+# compatErrorString is used by the extension mechanism but not in DIRACCommon
+compatErrorString = {}
+
+
+def includeExtensionErrors():
+    """Merge all the errors of all the extensions into the errors of these modules
+    Should be called only at the initialization of DIRAC, so by the parseCommandLine,
+    dirac-agent.py, dirac-service.py, dirac-executor.py
+    """
+    for extension in reversed(extensionsByPriority()):
+        if extension == "DIRAC":
+            continue
+        try:
+            ext_derrno = importlib.import_module(f"{extension}.Core.Utilities.DErrno")
+        except ImportError:
+            pass
+        else:
+            # The next 3 dictionary MUST be present for consistency
+            # Global name of errors
+            sys.modules[__name__].__dict__.update(ext_derrno.extra_dErrName)
+            # Dictionary with the error codes
+            sys.modules[__name__].dErrorCode.update(ext_derrno.extra_dErrorCode)
+            # Error description string
+            sys.modules[__name__].dStrError.update(ext_derrno.extra_dStrError)
+
+            # extra_compatErrorString is optional
+            for err in getattr(ext_derrno, "extra_compatErrorString", []):
+                sys.modules[__name__].compatErrorString.setdefault(err, []).extend(
+                    ext_derrno.extra_compatErrorString[err]
+                )

{dirac-9.0.0a64 → dirac-9.0.0a67}/src/DIRAC/Core/Utilities/JDL.py

@@ -1,203 +1,9 @@
 """Transformation classes around the JDL format."""
 
-from diraccfg import CFG
-from pydantic import ValidationError
+from DIRACCommon.Core.Utilities.JDL import *  # noqa: F403,F401
 
-from DIRAC import S_OK, S_ERROR
-from DIRAC.Core.Utilities import List
-from DIRAC.Core.Utilities.ClassAd.ClassAdLight import ClassAd
 from DIRAC.WorkloadManagementSystem.Utilities.JobModel import BaseJobDescriptionModel
 
-ARGUMENTS = "Arguments"
-BANNED_SITES = "BannedSites"
-CPU_TIME = "CPUTime"
-EXECUTABLE = "Executable"
-EXECUTION_ENVIRONMENT = "ExecutionEnvironment"
-GRID_CE = "GridCE"
-INPUT_DATA = "InputData"
-INPUT_DATA_POLICY = "InputDataPolicy"
-INPUT_SANDBOX = "InputSandbox"
-JOB_CONFIG_ARGS = "JobConfigArgs"
-JOB_TYPE = "JobType"
-JOB_GROUP = "JobGroup"
-LOG_LEVEL = "LogLevel"
-NUMBER_OF_PROCESSORS = "NumberOfProcessors"
-MAX_NUMBER_OF_PROCESSORS = "MaxNumberOfProcessors"
-MIN_NUMBER_OF_PROCESSORS = "MinNumberOfProcessors"
-OUTPUT_DATA = "OutputData"
-OUTPUT_PATH = "OutputPath"
-OUTPUT_SE = "OutputSE"
-PLATFORM = "Platform"
-PRIORITY = "Priority"
-STD_ERROR = "StdError"
-STD_OUTPUT = "StdOutput"
-OUTPUT_SANDBOX = "OutputSandbox"
-JOB_NAME = "JobName"
-SITE = "Site"
-TAGS = "Tags"
-
-OWNER = "Owner"
-OWNER_GROUP = "OwnerGroup"
-VO = "VirtualOrganization"
-
-CREDENTIALS_FIELDS = {OWNER, OWNER_GROUP, VO}
-
-
-def loadJDLAsCFG(jdl):
-    """
-    Load a JDL as CFG
-    """
-
-    def cleanValue(value):
-        value = value.strip()
-        if value[0] == '"':
-            entries = []
-            iPos = 1
-            current = ""
-            state = "in"
-            while iPos < len(value):
-                if value[iPos] == '"':
-                    if state == "in":
-                        entries.append(current)
-                        current = ""
-                        state = "out"
-                    elif state == "out":
-                        current = current.strip()
-                        if current not in (",",):
-                            return S_ERROR("value seems a list but is not separated in commas")
-                        current = ""
-                        state = "in"
-                else:
-                    current += value[iPos]
-                iPos += 1
-            if state == "in":
-                return S_ERROR('value is opened with " but is not closed')
-            return S_OK(", ".join(entries))
-        else:
-            return S_OK(value.replace('"', ""))
-
-    def assignValue(key, value, cfg):
-        key = key.strip()
-        if len(key) == 0:
-            return S_ERROR("Invalid key name")
-        value = value.strip()
-        if not value:
-            return S_ERROR(f"No value for key {key}")
-        if value[0] == "{":
-            if value[-1] != "}":
-                return S_ERROR("Value '%s' seems a list but does not end in '}'" % (value))
-            valList = List.fromChar(value[1:-1])
-            for i in range(len(valList)):
-                result = cleanValue(valList[i])
-                if not result["OK"]:
-                    return S_ERROR(f"Var {key} : {result['Message']}")
-                valList[i] = result["Value"]
-                if valList[i] is None:
-                    return S_ERROR(f"List value '{value}' seems invalid for item {i}")
-            value = ", ".join(valList)
-        else:
-            result = cleanValue(value)
-            if not result["OK"]:
-                return S_ERROR(f"Var {key} : {result['Message']}")
-            nV = result["Value"]
-            if nV is None:
-                return S_ERROR(f"Value '{value} seems invalid")
-            value = nV
-        cfg.setOption(key, value)
-        return S_OK()
-
-    if jdl[0] == "[":
-        iPos = 1
-    else:
-        iPos = 0
-    key = ""
-    value = ""
-    action = "key"
-    insideLiteral = False
-    cfg = CFG()
-    while iPos < len(jdl):
-        char = jdl[iPos]
-        if char == ";" and not insideLiteral:
-            if key.strip():
-                result = assignValue(key, value, cfg)
-                if not result["OK"]:
-                    return result
-            key = ""
-            value = ""
-            action = "key"
-        elif char == "[" and not insideLiteral:
-            key = key.strip()
-            if not key:
-                return S_ERROR("Invalid key in JDL")
-            if value.strip():
-                return S_ERROR(f"Key {key} seems to have a value and open a sub JDL at the same time")
-            result = loadJDLAsCFG(jdl[iPos:])
-            if not result["OK"]:
-                return result
-            subCfg, subPos = result["Value"]
-            cfg.createNewSection(key, contents=subCfg)
-            key = ""
-            value = ""
-            action = "key"
-            insideLiteral = False
-            iPos += subPos
-        elif char == "=" and not insideLiteral:
-            if action == "key":
-                action = "value"
-                insideLiteral = False
-            else:
-                value += char
-        elif char == "]" and not insideLiteral:
-            key = key.strip()
-            if len(key) > 0:
-                result = assignValue(key, value, cfg)
-                if not result["OK"]:
-                    return result
-            return S_OK((cfg, iPos))
-        else:
-            if action == "key":
-                key += char
-            else:
-                value += char
-                if char == '"':
-                    insideLiteral = not insideLiteral
-        iPos += 1
-
-    return S_OK((cfg, iPos))
-
-
-def dumpCFGAsJDL(cfg, level=1, tab="  "):
-    indent = tab * level
-    contents = [f"{tab * (level - 1)}["]
-    sections = cfg.listSections()
-
-    for key in cfg:
-        if key in sections:
-            contents.append(f"{indent}{key} =")
-            contents.append(f"{dumpCFGAsJDL(cfg[key], level + 1, tab)};")
-        else:
-            val = List.fromChar(cfg[key])
-            # Some attributes are never lists
-            if len(val) < 2 or key in [ARGUMENTS, EXECUTABLE, STD_OUTPUT, STD_ERROR]:
-                value = cfg[key]
-                try:
-                    try_value = float(value)
-                    contents.append(f"{tab * level}{key} = {value};")
-                except Exception:
-                    contents.append(f'{tab * level}{key} = "{value}";')
-            else:
-                contents.append(f"{indent}{key} =")
-                contents.append("%s{" % indent)
-                for iPos in range(len(val)):
-                    try:
-                        value = float(val[iPos])
-                    except Exception:
-                        val[iPos] = f'"{val[iPos]}"'
-                contents.append(",\n".join([f"{tab * (level + 1)}{value}" for value in val]))
-                contents.append("%s};" % indent)
-    contents.append(f"{tab * (level - 1)}]")
-    return "\n".join(contents)
-
 
 def jdlToBaseJobDescriptionModel(classAd: ClassAd):
     """

dirac-9.0.0a67/src/DIRAC/Core/Utilities/List.py

@@ -0,0 +1 @@
+from DIRACCommon.Core.Utilities.List import *  # noqa: F401,F403

dirac-9.0.0a67/src/DIRAC/Core/Utilities/ReturnValues.py

@@ -0,0 +1,10 @@
+"""Backward compatibility wrapper - moved to DIRACCommon
+
+This module has been moved to DIRACCommon.Core.Utilities.ReturnValues to avoid
+circular dependencies and allow DiracX to use these utilities without
+triggering DIRAC's global state initialization.
+
+All exports are maintained for backward compatibility.
+"""
+# Re-export everything from DIRACCommon for backward compatibility
+from DIRACCommon.Core.Utilities.ReturnValues import *  # noqa: F401, F403

dirac-9.0.0a67/src/DIRAC/Core/Utilities/StateMachine.py

@@ -0,0 +1,19 @@
+"""Backward compatibility wrapper - moved to DIRACCommon
+
+This module has been moved to DIRACCommon.Core.Utilities.StateMachine to avoid
+circular dependencies and allow DiracX to use these utilities without
+triggering DIRAC's global state initialization.
+
+All exports are maintained for backward compatibility.
+"""
+# Re-export everything from DIRACCommon for backward compatibility
+from DIRACCommon.Core.Utilities.StateMachine import *  # noqa: F401, F403
+
+from DIRAC import gLogger
+
+
+class StateMachine(StateMachine):  # noqa: F405 pylint: disable=function-redefined
+    """Backward compatibility wrapper - moved to DIRACCommon"""
+
+    def setState(self, candidateState, noWarn=False):
+        return super().setState(candidateState, noWarn, logger_warn=gLogger.warn)

dirac-9.0.0a67/src/DIRAC/Core/Utilities/TimeUtilities.py

@@ -0,0 +1,17 @@
+"""Backward compatibility wrapper - moved to DIRACCommon
+
+This module has been moved to DIRACCommon.Core.Utilities.TimeUtilities to avoid
+circular dependencies and allow DiracX to use these utilities without
+triggering DIRAC's global state initialization.
+
+All exports are maintained for backward compatibility.
+"""
+from functools import partial
+
+# Re-export everything from DIRACCommon for backward compatibility
+from DIRACCommon.Core.Utilities.TimeUtilities import *  # noqa: F401, F403
+
+from DIRAC import gLogger
+
+
+timeThis = partial(timeThis, logger_info=gLogger.info)

{dirac-9.0.0a64 → dirac-9.0.0a67}/src/DIRAC/Core/Utilities/test/Test_JDL.py

@@ -19,9 +19,6 @@ def jdl_monkey_business(monkeypatch):
     monkeypatch.setattr("DIRAC.Core.Base.API.getSites", lambda: S_OK(["LCG.IN2P3.fr"]))
     monkeypatch.setattr("DIRAC.WorkloadManagementSystem.Utilities.JobModel.getSites", lambda: S_OK(["LCG.IN2P3.fr"]))
     monkeypatch.setattr("DIRAC.Interfaces.API.Job.getDIRACPlatforms", lambda: S_OK("x86_64-slc6-gcc49-opt"))
-    monkeypatch.setattr(
-        "DIRAC.WorkloadManagementSystem.Utilities.JobModel.getDIRACPlatforms", lambda: S_OK("x86_64-slc6-gcc49-opt")
-    )
     yield
 
 

{dirac-9.0.0a64 → dirac-9.0.0a67}/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)

{dirac-9.0.0a64 → dirac-9.0.0a67}/src/DIRAC/DataManagementSystem/DB/FTS3DB.py

@@ -16,6 +16,7 @@ from sqlalchemy import (
     Enum,
     Float,
     ForeignKey,
+    Index,
     Integer,
     MetaData,
     SmallInteger,
@@ -85,6 +86,7 @@ fts3JobTable = Table(
     Column("error", String(2048)),
     Column("status", Enum(*FTS3Job.ALL_STATES), server_default=FTS3Job.INIT_STATE, index=True),
     Column("assignment", String(255), server_default=None),
+    Index("idx_jobs_lastupdate_assignment", "lastUpdate", "assignment"),
     mysql_engine="InnoDB",
 )
 
@@ -110,6 +112,7 @@ fts3OperationTable = Table(
     Column("error", String(1024)),
     Column("type", String(255)),
     Column("assignment", String(255), server_default=None),
+    Index("idx_operations_lastupdate_assignment", "lastUpdate", "assignment"),
     mysql_engine="InnoDB",
 )
 

{dirac-9.0.0a64 → dirac-9.0.0a67}/src/DIRAC/RequestManagementSystem/DB/test/RMSTestScenari.py

@@ -6,6 +6,7 @@ integration tests (Test_ReqDB.py)
 # pylint: disable=invalid-name,wrong-import-position
 import time
 
+import pytest
 
 from DIRAC.RequestManagementSystem.Client.Request import Request
 from DIRAC.RequestManagementSystem.Client.Operation import Operation
@@ -42,6 +43,7 @@ def test_stress(reqDB):
         assert delete["OK"], delete
 
 
+@pytest.mark.slow
 def test_stressBulk(reqDB):
     """stress test bulk"""
 

{dirac-9.0.0a64 → dirac-9.0.0a67}/src/DIRAC/Resources/Catalog/RucioFileCatalogClient.py

@@ -151,7 +151,7 @@ class RucioFileCatalogClient(FileCatalogClientBase):
             self.authHost = options.get("AuthHost", None)
             self.caCertPath = Locations.getCAsLocation()
             try:
-                sLog.info(f"Logging in with a proxy located at: {self.proxyPath}")
+                sLog.debug(f"Logging in with a proxy located at: {self.proxyPath}")
                 sLog.debug("account: ", self.username)
                 sLog.debug("rucio host: ", self.rucioHost)
                 sLog.debug("auth  host: ", self.authHost)

{dirac-9.0.0a64 → dirac-9.0.0a67}/src/DIRAC/Resources/Computing/test/Test_PoolComputingElement.py

@@ -25,7 +25,7 @@ while True:
   if os.path.isfile(stopFile):
     os.remove(stopFile)
     break
-  if (time.time() - start) > 30:
+  if (time.time() - start) > 5:
     break
 print("End job", jobNumber, time.time())
 """
@@ -262,6 +262,7 @@ def test_executeJob_wholeNode8(createAndDelete):
             assert "Not enough processors" in submissionResult["Message"]
 
 
+@pytest.mark.slow
 def test_executeJob_submitAndStop(createAndDelete):
     time.sleep(0.5)
 

{dirac-9.0.0a64 → dirac-9.0.0a67}/src/DIRAC/TransformationSystem/Agent/TransformationCleaningAgent.py

@@ -37,7 +37,7 @@ from DIRAC.WorkloadManagementSystem.Service.JobPolicy import (
     RIGHT_DELETE,
     RIGHT_KILL,
 )
-from DIRAC.WorkloadManagementSystem.Utilities.jobAdministration import kill_delete_jobs
+from DIRAC.WorkloadManagementSystem.DB.StatusUtils import kill_delete_jobs
 
 # # agent's name
 AGENT_NAME = "Transformation/TransformationCleaningAgent"