Merge pull request #261 from HSF/dev

fix doma panda work for polling panda jobs.
HSF · Jan 6, 2024 · cee7baa · cee7baa
2 parents 13e7d37 + 9f8516d
commit cee7baa
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/doma/lib/idds/doma/workflowv2/domapandawork.py b/doma/lib/idds/doma/workflowv2/domapandawork.py
@@ -1187,19 +1187,19 @@ def poll_panda_jobs(self, job_ids, log_prefix=''):
                 jobs = job_status_info[filename]['jobs']
                 panda_ids, status, job_info = self.get_last_job_info(jobs)
                 if status:
-                    job_status_info[input_file]['status'] = status
-                    job_status_info[input_file]['job_info'] = job_info
-                    job_status_info[input_file]['panda_id'] = panda_ids
+                    job_status_info[filename]['status'] = status
+                    job_status_info[filename]['job_info'] = job_info
+                    job_status_info[filename]['panda_id'] = panda_ids
         else:
             es_job_ids = []
             for filename in job_status_info:
                 job_set_id = job_status_info[filename]['job_set_id']
                 jobs = job_status_info[filename]['jobs']
                 panda_ids, status, job_info = self.get_last_job_info(jobs)
                 if status:
-                    job_status_info[input_file]['status'] = status
-                    job_status_info[input_file]['job_info'] = job_info
-                    job_status_info[input_file]['panda_id'] = panda_ids
+                    job_status_info[filename]['status'] = status
+                    job_status_info[filename]['job_info'] = job_info
+                    job_status_info[filename]['panda_id'] = panda_ids
                 if status in [ContentStatus.FinalSubAvailable]:
                     task_id = job_info.jediTaskID
                     for panda_id in panda_ids:

diff --git a/main/etc/sql/postgresql_update.sql b/main/etc/sql/postgresql_update.sql
@@ -11,3 +11,7 @@ alter table contents alter column name type varchar(8000);
 -- 2023.11.09
 -- update slac idds database, without updating the idds models
 alter table contents alter column name type varchar(40000);
+
+--2024.01.06
+alter table contents alter column content_metadata type VARCHAR(1000);
+alter table contents_update alter column content_metadata type VARCHAR(1000);
diff --git a/main/lib/idds/tests/panda_test.py b/main/lib/idds/tests/panda_test.py
@@ -45,7 +45,7 @@
 task_ids = [i for i in range(166636, 166778)]
 task_ids = [166253, 166254]
 task_ids = [167759]
-task_ids = [i for i in range(167759, 167774)]
+task_ids = [i for i in range(167781, 167785)]
 for task_id in task_ids:
     print("Killing %s" % task_id)
     ret = Client.killTask(task_id, verbose=True)