Merge pull request #307 from tmaeno/master

enabled job submission with json
PanDAWMS · Feb 27, 2024 · 1ae729a · 1ae729a
2 parents b8af15c + 4d8f6f4
commit 1ae729a
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/pandaserver/userinterface/UserIF.py b/pandaserver/userinterface/UserIF.py
@@ -10,10 +10,11 @@
 import time
 import traceback
 
-import pandaserver.jobdispatcher.Protocol as Protocol
-import pandaserver.taskbuffer.ProcessGroups
 from pandacommon.pandalogger.LogWrapper import LogWrapper
 from pandacommon.pandalogger.PandaLogger import PandaLogger
+
+import pandaserver.jobdispatcher.Protocol as Protocol
+import pandaserver.taskbuffer.ProcessGroups
 from pandaserver.brokerage.SiteMapper import SiteMapper
 from pandaserver.config import panda_config
 from pandaserver.dataservice.DDM import rucioAPI
@@ -47,7 +48,10 @@ def init(self, taskBuffer):
     def submitJobs(self, jobsStr, user, host, userFQANs, prodRole=False, toPending=False):
         try:
             # deserialize jobspecs
-            jobs = WrappedPickle.loads(jobsStr)
+            try:
+                jobs = WrappedPickle.loads(jobsStr)
+            except Exception:
+                jobs = JobUtils.load_jobs_json(jobsStr)
             _logger.debug(f"submitJobs {user} len:{len(jobs)} prodRole={prodRole} FQAN:{str(userFQANs)}")
             maxJobs = 5000
             if len(jobs) > maxJobs: