rucio 35.7.0__py3-none-any.whl → 37.0.0__py3-none-any.whl

rucio/daemons/tracer/kronos.py

@@ -364,7 +364,7 @@ def run_once_kronos_file(heartbeat_handler: HeartbeatHandler, stomp_conn_mngr: S
         username = config_get('tracer-kronos', 'username')
         password = config_get('tracer-kronos', 'password')
 
-    excluded_usrdns = set(config_get('tracer-kronos', 'excluded_usrdns').split(','))
+    excluded_usrdns = set(config_get_list('tracer-kronos', 'excluded_usrdns'))
     vhost = config_get('tracer-kronos', 'broker_virtual_host', raise_exception=False)
 
     brokers_alias = config_get_list('tracer-kronos', 'brokers')
@@ -458,7 +458,7 @@ def run_once_kronos_dataset(dataset_queue: Queue, return_values: dict, heartbeat
     total, failed, start = 0, 0, time()
     for did, accessed_at in datasets.items():
         scope, name = did.split(':')
-        scope = InternalScope(scope, fromExternal=False)
+        scope = InternalScope(scope, from_external=False)
         update_did = {'scope': scope, 'name': name, 'type': DIDType.DATASET, 'accessed_at': accessed_at}
         # if update fails, put back in queue and retry next time
         if not touch_dids((update_did,)):
@@ -471,7 +471,7 @@ def run_once_kronos_dataset(dataset_queue: Queue, return_values: dict, heartbeat
     total, failed, start = 0, 0, time()
     for did, rses in dslocks.items():
         scope, name = did.split(':')
-        scope = InternalScope(scope, fromExternal=False)
+        scope = InternalScope(scope, from_external=False)
         for rse, accessed_at in rses.items():
             update_dslock = {'scope': scope, 'name': name, 'rse_id': rse, 'accessed_at': accessed_at}
             # if update fails, put back in queue and retry next time
@@ -484,7 +484,7 @@ def run_once_kronos_dataset(dataset_queue: Queue, return_values: dict, heartbeat
     total, failed, start = 0, 0, time()
     for did, rses in dslocks.items():
         scope, name = did.split(':')
-        scope = InternalScope(scope, fromExternal=False)
+        scope = InternalScope(scope, from_external=False)
         for rse, accessed_at in rses.items():
             update_dslock = {'scope': scope, 'name': name, 'rse_id': rse, 'accessed_at': accessed_at}
             # if update fails, put back in queue and retry next time

rucio/db/sqla/constants.py

@@ -199,3 +199,8 @@ class SubscriptionState(Enum):
 class TransferLimitDirection(Enum):
     SOURCE = 'S'
     DESTINATION = 'D'
+
+
+class DatabaseOperationType(Enum):
+    READ = 'read'
+    WRITE = 'write'

rucio/db/sqla/migrate_repo/versions/1677d4d803c8_split_rse_availability_into_multiple.py

@@ -38,7 +38,7 @@ def upgrade():
         add_column("rses", sa.Column("availability_write", sa.Boolean, server_default=true()), schema=schema)
         add_column("rses", sa.Column("availability_delete", sa.Boolean, server_default=true()), schema=schema)
 
-        RSE = sa.sql.table(
+        rse = sa.sql.table(
             "rses",
             sa.Column("id", GUID()),
             sa.Column("availability", sa.Integer),
@@ -50,9 +50,9 @@ def upgrade():
 
         conn = get_bind()
 
-        conn.execute(RSE.update().where(RSE.c.availability.in_([0, 1, 2, 3])).values({"availability_read": False}))
-        conn.execute(RSE.update().where(RSE.c.availability.in_([0, 1, 4, 5])).values({"availability_write": False}))
-        conn.execute(RSE.update().where(RSE.c.availability.in_([0, 2, 4, 6])).values({"availability_delete": False}))
+        conn.execute(rse.update().where(rse.c.availability.in_([0, 1, 2, 3])).values({"availability_read": False}))
+        conn.execute(rse.update().where(rse.c.availability.in_([0, 1, 4, 5])).values({"availability_write": False}))
+        conn.execute(rse.update().where(rse.c.availability.in_([0, 2, 4, 6])).values({"availability_delete": False}))
 
 
 def downgrade():

rucio/db/sqla/migrate_repo/versions/30d5206e9cad_increase_oauthrequest_redirect_msg_.py

@@ -0,0 +1,37 @@
+# Copyright European Organization for Nuclear Research (CERN) since 2012
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Increase OAuthRequest.redirect_msg length"""    # noqa: D400, D415
+
+import sqlalchemy as sa
+from alembic import context
+from alembic.op import alter_column
+
+# Alembic revision identifiers
+revision = '30d5206e9cad'
+down_revision = 'b0070f3695c8'
+
+
+def upgrade():
+    """Upgrade the database to this revision."""
+    if context.get_context().dialect.name in ['oracle', 'mysql', 'postgresql']:
+        schema = context.get_context().version_table_schema if context.get_context().version_table_schema else ''
+        alter_column('oauth_requests', 'redirect_msg', existing_type=sa.String(2048), type_=sa.String(4000), schema=schema)
+
+
+def downgrade():
+    """Downgrade the database to the previous revision."""
+    if context.get_context().dialect.name in ['oracle', 'mysql', 'postgresql']:
+        schema = context.get_context().version_table_schema if context.get_context().version_table_schema else ''
+        alter_column('oauth_requests', 'redirect_msg', existing_type=sa.String(4000), type_=sa.String(2048), schema=schema)