rucio 38.1.0__py3-none-any.whl → 38.3.0__py3-none-any.whl

rucio/daemons/judge/evaluator.py

@@ -92,12 +92,12 @@ def run_once(
                             worker_number=worker_number,
                             limit=did_limit,
                             blocked_dids=[(InternalScope(key[0], from_external=False), key[1]) for key in paused_dids])
-    logger(logging.DEBUG, 'index query time %f fetch size is %d (%d blocked)', time.time() - start, len(dids),
+    logger(logging.DEBUG, 'Index query time %f fetch size is %d (%d blocked)', time.time() - start, len(dids),
            len([(InternalScope(key[0], from_external=False), key[1]) for key in paused_dids]))
 
     # If the list is empty, sent the worker to sleep
     if not dids:
-        logger(logging.DEBUG, 'did not get any work (paused_dids=%s)', str(len(paused_dids)))
+        logger(logging.DEBUG, 'Did not get any work (paused_dids=%s)', str(len(paused_dids)))
         return
 
     done_dids = {}

rucio/daemons/judge/injector.py

@@ -83,10 +83,10 @@ def run_once(
                                worker_number=worker_number,
                                limit=100,
                                blocked_rules=[key for key in paused_rules])
-    logger(logging.DEBUG, 'index query time %f fetch size is %d' % (time.time() - start, len(rules)))
+    logger(logging.DEBUG, 'Index query time %f fetch size is %d' % (time.time() - start, len(rules)))
 
     if not rules:
-        logger(logging.DEBUG, 'did not get any work (paused_rules=%s)' % str(len(paused_rules)))
+        logger(logging.DEBUG, 'Did not get any work (paused_rules=%s)' % str(len(paused_rules)))
         return
 
     for rule_id in rules:
@@ -97,12 +97,13 @@ def run_once(
         try:
             start = time.time()
             inject_rule(rule_id=rule_id, logger=logger)
-            logger(logging.DEBUG, 'injection of %s took %f' % (rule_id, time.time() - start))
+            logger(logging.DEBUG, 'Injection of %s took %f' % (rule_id, time.time() - start))
         except (DatabaseException, DatabaseError) as e:
             if match(ORACLE_RESOURCE_BUSY_REGEX, str(e.args[0])) or match(PSQL_PSYCOPG_LOCK_NOT_AVAILABLE_REGEX, str(e.args[0])) or match(MYSQL_LOCK_NOWAIT_REGEX, str(e.args[0])):
                 paused_rules[rule_id] = datetime.utcnow() + timedelta(seconds=randint(60, 600))  # noqa: S311
                 METRICS.counter('exceptions.{exception}').labels(exception='LocksDetected').inc()
-                logger(logging.WARNING, 'Locks detected for %s' % rule_id)
+                logger(logging.WARNING,
+                       'Database locks detected for %s. Another instance might be processing this rule at the moment' % rule_id)
             elif match('.*QueuePool.*', str(e.args[0])):
                 logger(logging.WARNING, 'DatabaseException', exc_info=True)
                 METRICS.counter('exceptions.{exception}').labels(exception=e.__class__.__name__).inc()

rucio/daemons/judge/repairer.py

@@ -90,10 +90,10 @@ def run_once(
                             limit=100,
                             blocked_rules=[key for key in paused_rules])
 
-    logger(logging.DEBUG, 'index query time %f fetch size is %d' % (time.time() - start, len(rules)))
+    logger(logging.DEBUG, 'Index query time %f fetch size is %d' % (time.time() - start, len(rules)))
 
     if not rules:
-        logger(logging.DEBUG, 'did not get any work (paused_rules=%s)' % (str(len(paused_rules))))
+        logger(logging.DEBUG, 'Did not get any work (paused_rules=%s)' % (str(len(paused_rules))))
         return
 
     for rule_id in rules:

rucio/gateway/config.py

@@ -47,23 +47,6 @@ def sections(issuer: str, vo: str = DEFAULT_VO) -> list[str]:
         return config.sections(session=session)
 
 
-def add_section(section: str, issuer: str, vo: str = DEFAULT_VO) -> None:
-    """
-    Add a section to the configuration.
-
-    :param section: The name of the section.
-    :param issuer: The issuer account.
-    :param vo: The VO to act on.
-    """
-
-    kwargs = {'issuer': issuer, 'section': section}
-    with db_session(DatabaseOperationType.WRITE) as session:
-        auth_result = permission.has_permission(issuer=issuer, vo=vo, action='config_add_section', kwargs=kwargs, session=session)
-        if not auth_result.allowed:
-            raise exception.AccessDenied('%s cannot add section %s. %s' % (issuer, section, auth_result.message))
-        return config.add_section(section, session=session)
-
-
 def has_section(section: str, issuer: str, vo: str = DEFAULT_VO) -> bool:
     """
     Indicates whether the named section is present in the configuration.
@@ -79,25 +62,7 @@ def has_section(section: str, issuer: str, vo: str = DEFAULT_VO) -> bool:
         auth_result = permission.has_permission(issuer=issuer, vo=vo, action='config_has_section', kwargs=kwargs, session=session)
         if not auth_result.allowed:
             raise exception.AccessDenied('%s cannot check existence of section %s. %s' % (issuer, section, auth_result.message))
-        return config.has_section(section, session=session)
-
-
-def options(section: str, issuer: str, vo: str = DEFAULT_VO) -> list[str]:
-    """
-    Returns a list of options available in the specified section.
-
-    :param section: The name of the section.
-    :param issuer: The issuer account.
-    :param vo: The VO to act on.
-    :returns: ['option', ...]
-    """
-
-    kwargs = {'issuer': issuer, 'section': section}
-    with db_session(DatabaseOperationType.READ) as session:
-        auth_result = permission.has_permission(issuer=issuer, vo=vo, action='config_options', kwargs=kwargs, session=session)
-        if auth_result.allowed:
-            raise exception.AccessDenied('%s cannot retrieve options from section %s. %s' % (issuer, section, auth_result.message))
-        return config.options(section, session=session)
+        return config.has_section(section, session=session, use_cache=False)
 
 
 def has_option(section: str, option: str, issuer: str, vo: str = DEFAULT_VO) -> bool:
@@ -116,7 +81,7 @@ def has_option(section: str, option: str, issuer: str, vo: str = DEFAULT_VO) ->
         auth_result = permission.has_permission(issuer=issuer, vo=vo, action='config_has_option', kwargs=kwargs, session=session)
         if not auth_result.allowed:
             raise exception.AccessDenied('%s cannot check existence of option %s from section %s. %s' % (issuer, option, section, auth_result.message))
-        return config.has_option(section, option, session=session)
+        return config.has_option(section, option, session=session, use_cache=False)
 
 
 def get(section: str, option: str, issuer: str, vo: str = DEFAULT_VO) -> Any:

rucio/gateway/rule.py

@@ -15,7 +15,7 @@
 from typing import TYPE_CHECKING, Any, Literal, Optional
 
 from rucio.common.config import config_get_bool
-from rucio.common.constants import DEFAULT_VO
+from rucio.common.constants import DEFAULT_ACTIVITY, DEFAULT_VO
 from rucio.common.exception import AccessDenied
 from rucio.common.schema import validate_schema
 from rucio.common.types import InternalAccount, InternalScope
@@ -97,7 +97,7 @@ def add_replication_rule(
         account = issuer
 
     if activity is None:
-        activity = 'User Subscriptions'
+        activity = DEFAULT_ACTIVITY
 
     kwargs = {'dids': dids, 'copies': copies, 'rse_expression': rse_expression, 'weight': weight, 'lifetime': lifetime,
               'grouping': grouping, 'account': account, 'locked': locked, 'subscription_id': subscription_id,

rucio/rse/translation.py

@@ -18,7 +18,7 @@ from configparser import NoOptionError, NoSectionError
 from typing import TYPE_CHECKING, Any, Optional
 
 from rucio.common import config
-from rucio.common.constants import DEFAULT_VO, RseAttr
+from rucio.common.constants import DEFAULT_VO, POLICY_ALGORITHM_TYPES_LITERAL, RseAttr
 from rucio.common.exception import ConfigNotFound
 from rucio.common.plugins import PolicyPackageAlgorithms
 
@@ -33,7 +33,7 @@ class RSEDeterministicScopeTranslation(PolicyPackageAlgorithms):
         Translates a pfn dictionary into a scope and name
     """
 
-    _algorithm_type = "pfn2lfn"
+    _algorithm_type: POLICY_ALGORITHM_TYPES_LITERAL = "pfn2lfn"
 
     def __init__(self, vo: str = DEFAULT_VO):
         super().__init__()
@@ -111,7 +111,7 @@ class RSEDeterministicTranslation(PolicyPackageAlgorithms):
     """
 
     _DEFAULT_LFN2PFN = "hash"
-    _algorithm_type = "lfn2pfn"
+    _algorithm_type: POLICY_ALGORITHM_TYPES_LITERAL = "lfn2pfn"
 
     def __init__(
             self,

rucio/transfertool/fts3_plugins.py

@@ -17,7 +17,7 @@ import sys
 from typing import TYPE_CHECKING, Any, Optional, TypeVar
 
 from rucio.common.config import config_get_int
-from rucio.common.constants import DEFAULT_VO
+from rucio.common.constants import DEFAULT_VO, POLICY_ALGORITHM_TYPES_LITERAL
 from rucio.common.exception import InvalidRequest
 from rucio.common.plugins import PolicyPackageAlgorithms
 
@@ -33,8 +33,8 @@ class FTS3TapeMetadataPlugin(PolicyPackageAlgorithms):
     Plugins are registered during initialization and called during a transfer with FTS3
     """
 
-    ALGORITHM_NAME = "fts3_tape_metadata_plugins"
-    _INIT_FUNC_NAME = "fts3_plugins_init"
+    ALGORITHM_NAME: POLICY_ALGORITHM_TYPES_LITERAL = "fts3_tape_metadata_plugins"
+    _INIT_FUNC_NAME: POLICY_ALGORITHM_TYPES_LITERAL = "fts3_plugins_init"
     DEFAULT = "def"
 
     def __init__(self, policy_algorithm: str) -> None:

rucio/vcsversion.py

@@ -4,8 +4,8 @@ This file is automatically generated; Do not edit it. :)
 '''
 VERSION_INFO = {
     'final': True,
-    'version': '38.1.0',
+    'version': '38.3.0',
     'branch_nick': 'release-38-LTS',
-    'revision_id': 'f63f25c84c254eac1701a9640e3cb658a7bbdd8e',
-    'revno': 13947
+    'revision_id': '5eebc4e67a544dcb2d689bd45260cb73fb10066a',
+    'revno': 14003
 }

rucio/web/rest/flaskapi/v1/config.py

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from typing import TYPE_CHECKING
+
 from flask import Flask, jsonify
 from flask import request as request
 
@@ -20,12 +22,15 @@ from rucio.gateway import config
 from rucio.web.rest.flaskapi.authenticated_bp import AuthenticatedBlueprint
 from rucio.web.rest.flaskapi.v1.common import ErrorHandlingMethodView, check_accept_header_wrapper_flask, generate_http_error_flask, json_parameters, response_headers
 
+if TYPE_CHECKING:
+    from flask.typing import ResponseReturnValue
+
 
 class Config(ErrorHandlingMethodView):
     """ REST API for full configuration. """
 
     @check_accept_header_wrapper_flask(['application/json'])
-    def get(self):
+    def get(self) -> 'ResponseReturnValue':
         """
         ---
         summary: List
@@ -53,7 +58,7 @@ class Config(ErrorHandlingMethodView):
 
         return jsonify(res), 200
 
-    def post(self):
+    def post(self) -> 'ResponseReturnValue':
         """
         ---
         summary: Create
@@ -97,7 +102,7 @@ class Section(ErrorHandlingMethodView):
     """ REST API for the sections in the configuration. """
 
     @check_accept_header_wrapper_flask(['application/json'])
-    def get(self, section):
+    def get(self, section: str) -> 'ResponseReturnValue':
         """
         ---
         summary: List Sections
@@ -136,25 +141,55 @@ class Section(ErrorHandlingMethodView):
           406:
             description: "Not acceptable"
         """
-        res = {}
-        for item in config.items(section, issuer=request.environ['issuer'], vo=request.environ['vo']):
-            res[item[0]] = item[1]
+        if config.has_section(section, issuer=request.environ['issuer'], vo=request.environ['vo']):
+            res = {}
+            for item in config.items(section, issuer=request.environ['issuer'], vo=request.environ['vo']):
+                res[item[0]] = item[1]
+            return jsonify(res), 200
 
-        if res == {}:
+        else:
             return generate_http_error_flask(
                 status_code=404,
                 exc=ConfigNotFound.__name__,
                 exc_msg=f"No configuration found for section '{section}'"
             )
 
-        return jsonify(res), 200
+    def delete(self, section: str) -> 'ResponseReturnValue':
+        """
+        ---
+        summary: Remove an existing section
+        tags:
+          - Config
+        parameters:
+        - name: section
+          in: path
+          description: "The section."
+        responses:
+          200:
+            description: "OK"
+          401:
+            description: "Invalid Auth Token"
+          404:
+            description: "Config not found"
+          406:
+            description: "Not acceptable"
+        """
+        if config.has_section(section, issuer=request.environ['issuer'], vo=request.environ['vo']):
+            config.remove_section(section, issuer=request.environ['issuer'], vo=request.environ['vo'])
+            return '', 200
+        else:
+            return generate_http_error_flask(
+                status_code=404,
+                exc=ConfigNotFound.__name__,
+                exc_msg=f"No configuration found for section '{section}'"
+            )
 
 
 class OptionGetDel(ErrorHandlingMethodView):
     """ REST API for reading or deleting the options in the configuration. """
 
     @check_accept_header_wrapper_flask(['application/json'])
-    def get(self, section, option):
+    def get(self, section: str, option: str) -> 'ResponseReturnValue':
         """
         ---
         summary: Get option
@@ -197,7 +232,7 @@ class OptionGetDel(ErrorHandlingMethodView):
         except ConfigNotFound as error:
             return generate_http_error_flask(404, error, f"No configuration found for section '{section}' option '{option}'")
 
-    def delete(self, section, option):
+    def delete(self, section: str, option: str) -> 'ResponseReturnValue':
         """
         ---
         summary: Delete option
@@ -223,14 +258,17 @@ class OptionGetDel(ErrorHandlingMethodView):
           401:
             description: "Invalid Auth Token"
         """
-        config.remove_option(section=section, option=option, issuer=request.environ['issuer'], vo=request.environ['vo'])
-        return '', 200
+        if config.has_option(section, option, issuer=request.environ['issuer'], vo=request.environ['vo']):
+            config.remove_option(section=section, option=option, issuer=request.environ['issuer'], vo=request.environ['vo'])
+            return '', 200
+        else:
+            return generate_http_error_flask(404, ConfigNotFound.__name__, f"No configuration found for section '{section}' option '{option}'")
 
 
 class OptionSet(ErrorHandlingMethodView):
     """ REST API for setting the options in the configuration. """
 
-    def put(self, section, option, value):
+    def put(self, section: str, option: str, value: str) -> 'ResponseReturnValue':
         """
         ---
         summary: Create value
@@ -289,7 +327,7 @@ def blueprint() -> AuthenticatedBlueprint:
     option_get_del_view = OptionGetDel.as_view('option_get_del')
     bp.add_url_rule('/<section>/<option>', view_func=option_get_del_view, methods=['get', 'delete'])
     section_view = Section.as_view('section')
-    bp.add_url_rule('/<section>', view_func=section_view, methods=['get', ])
+    bp.add_url_rule('/<section>', view_func=section_view, methods=['get', 'delete'])
     config_view = Config.as_view('config')
     bp.add_url_rule('', view_func=config_view, methods=['get', 'post'])
 

{rucio-38.1.0.dist-info → rucio-38.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rucio
-Version: 38.1.0
+Version: 38.3.0
 Summary: Rucio Package
 Home-page: https://rucio.cern.ch/
 Author: Rucio