Merge pull request #408 from HSF/dev

Dev

Author: wguanicedew

main/lib/idds/agents/carrier/utils.py

@@ -1818,7 +1818,10 @@ def handle_messages_processing(messages, logger=None, log_prefix='', update_proc
     update_contents = []
 
     for ori_msg in messages:
-        msg = json.loads(ori_msg)
+        if type(ori_msg) in [dict]:
+            msg = ori_msg
+        else:
+            msg = json.loads(ori_msg)
         if 'taskid' not in msg or not msg['taskid']:
             continue
 

main/lib/idds/orm/base/alembic/versions/6931b48500a2_add_campaign_group.py

@@ -77,9 +77,9 @@ def upgrade() -> None:
         op.create_unique_constraint('REQUESTGROUP_CM_UQ', 'requests_group', ['campaign', 'campaign_scope', 'campaign_group', 'campaign_tag'], schema=schema)
         op.create_check_constraint('REQUESTGROUP_STATUS_ID_NN', 'requests_group', 'status IS NOT NULL', schema=schema)
         op.create_index('REQUESTGROUP_CM_NAME_IDX', 'requests_group', ['campaign', 'campaign_scope', 'campaign_group', 'campaign_tag'], unique=True, schema=schema)
-        op.create_index('REQUESTGROUP_STATUS_SITE', 'requests_group', ['status', 'site', 'group_id']),
-        op.create_index('REQUESTGROUP_STATUS_PRIO_IDX', 'requests_group', ['status', 'priority', 'group_id', 'locking', 'updated_at', 'next_poll_at', 'created_at']),
-        op.create_index('REQUESTGROUP_STATUS_POLL_IDX', 'requests_group', ['status', 'priority', 'locking', 'updated_at', 'new_poll_period', 'update_poll_period', 'created_at', 'group_id'])
+        op.create_index('REQUESTGROUP_STATUS_SITE', 'requests_group', ['status', 'site', 'group_id'], schema=schema),
+        op.create_index('REQUESTGROUP_STATUS_PRIO_IDX', 'requests_group', ['status', 'priority', 'group_id', 'locking', 'updated_at', 'next_poll_at', 'created_at'], schema=schema),
+        op.create_index('REQUESTGROUP_STATUS_POLL_IDX', 'requests_group', ['status', 'priority', 'locking', 'updated_at', 'new_poll_period', 'update_poll_period', 'created_at', 'group_id'], schema=schema)
 
         # requests
         op.alter_column('requests', 'campaign_tag', type_=sa.String(100), schema=schema)
@@ -91,6 +91,11 @@ def downgrade() -> None:
     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 ''
 
+        # requests
+        op.alter_column('requests', 'campaign_tag', type_=sa.String(20), schema=schema)
+        op.drop_constraint('REQUESTS_GROUP_ID_FK', table_name='requests', schema=schema)
+        op.drop_column('requests', 'group_id', schema=schema)
+
         # requests_group
         op.drop_constraint('REQUESTGROUP_STATUS_ID_NN', table_name='requests_group', schema=schema)
         op.drop_constraint('REQUESTGROUP_CM_UQ', table_name='requests_group', schema=schema)
@@ -102,8 +107,3 @@ def downgrade() -> None:
         op.drop_index('REQUESTGROUP_STATUS_POLL_IDX', table_name='requests_group', schema=schema)
 
         op.drop_table('requests_group', schema=schema)
-
-        # requests
-        op.alter_column('requests', 'campaign_tag', type_=sa.String(20), schema=schema)
-        op.drop_constraint('REQUESTS_GROUP_ID_FK', table_name='requests', schema=schema)
-        op.drop_column('requests', 'group_id', schema=schema)

main/lib/idds/tests/panda_test.py

@@ -90,6 +90,7 @@
 task_ids = [161489, 161496, 161502, 161508, 161514, 161520, 161526, 161532, 161538, 161544, 161550, 161556, 161562]
 task_ids = [3174, 3198, 3209, 3230, 3252, 3266, 3284, 3292, 3300, 3312, 3350, 3379, 3387]
 task_ids = [1548, 1555]
+task_ids = [3906, 4266, 4267, 4357, 4358, 4414, 4416, 4417, 4418]
 for task_id in task_ids:
     print("Killing %s" % task_id)
     ret = Client.killTask(task_id, verbose=True)