Merge pull request #10964 from amaltaro/bundle-157patch1

Bundle 157patch1
dmwm · Jan 27, 2022 · e09fea2 · e09fea2
2 parents e9c15ff + 6f39327
commit e09fea2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/python/WMComponent/DBS3Buffer/DBSUploadPoller.py b/src/python/WMComponent/DBS3Buffer/DBSUploadPoller.py
@@ -85,7 +85,7 @@ def uploadWorker(workInput, results, dbsUrl):
             dbsApi.insertBulkBlock(blockDump=block)
             results.put({'name': name, 'success': "uploaded"})
         except Exception as ex:
-            exString = str(ex)
+            exString = str(getattr(ex, "body", ex))
             if 'Block %s already exists' % name in exString:
                 # Then this is probably a duplicate
                 # Ignore this for now

diff --git a/src/python/WMCore/WMExceptions.py b/src/python/WMCore/WMExceptions.py
@@ -192,9 +192,9 @@
                       71104: "JobSubmitter component could not find a job pickle object.",
                       71105: "JobSubmitter component loaded an empty job pickle object.",
                       71300: "The job was killed by the WMAgent, reason is unknown (WMAgent).",
-                      71301: "The job was killed by the WMAgent because the site it was running at was set to Aborted (WMAgent).",
-                      71302: "The job was killed by the WMAgent because the site it was running at was set to Draining (WMAgent).",
-                      71303: "The job was killed by the WMAgent because the site it was running at was set to Down (WMAgent).",
+                      71301: "The job was killed by WMAgent because the site it was supposed to run at was set to Aborted (WMAgent).",
+                      71302: "The job was killed by WMAgent because the site it was supposed to run at was set to Draining (WMAgent).",
+                      71303: "The job was killed by WMAgent because the site it was supposed to run at was set to Down (WMAgent).",
                       71304: "The job was killed by the WMAgent for using too much wallclock time (WMAgent) Job status was Running.",
                       71305: "The job was killed by the WMAgent for using too much wallclock time (WMAgent) Job status was Pending.",
                       71306: "The job was killed by the WMAgent for using too much wallclock time (WMAgent) Job status was Error.",