Merge pull request #7013 from DIRACGridBot/cherry-pick-2-ed24123d8-integration

[sweep:integration] Fix RMS monitoring with no object IDs

Author: fstagni

src/DIRAC/RequestManagementSystem/private/OperationHandlerBase.py

@@ -282,7 +282,7 @@ def createRMSRecord(self, status, nbObject):
             "operationType": self.operation.Type,
             "status": status,
             "nbObject": nbObject,
-            "parentID": self.operation.OperationID,
+            "parentID": getattr(self.operation, "OperationID", 0),
         }
 
         return record

src/DIRAC/RequestManagementSystem/private/RequestTask.py

@@ -291,8 +291,8 @@ def __call__(self):
                                 "host": Network.getFQDN(),
                                 "objectType": "Operation",
                                 "operationType": pluginName,
-                                "objectID": operation.OperationID,
-                                "parentID": operation.RequestID,
+                                "objectID": getattr(operation, "OperationID", 0),
+                                "parentID": getattr(operation, "RequestID", 0),
                                 "status": "Attempted",
                                 "nbObject": 1,
                             }
@@ -313,8 +313,8 @@ def __call__(self):
                                     "host": Network.getFQDN(),
                                     "objectType": "Operation",
                                     "operationType": pluginName,
-                                    "objectID": operation.OperationID,
-                                    "parentID": operation.RequestID,
+                                    "objectID": getattr(operation, "OperationID", 0),
+                                    "parentID": getattr(operation, "RequestID", 0),
                                     "status": "Failed",
                                     "nbObject": 1,
                                 }
@@ -325,7 +325,7 @@ def __call__(self):
                                 "timestamp": int(TimeUtilities.toEpochMilliSeconds()),
                                 "host": Network.getFQDN(),
                                 "objectType": "Request",
-                                "objectID": operation.RequestID,
+                                "objectID": getattr(operation, "RequestID", 0),
                                 "status": "Failed",
                                 "nbObject": 1,
                             }
@@ -347,7 +347,10 @@ def __call__(self):
                             if operation.Status != "Failed":
                                 operation.Status = "Failed"
                             self.request.Error = "Job no longer exists"
-            except Exception as error:
+            except Exception as e:
+                # We can't do except Exception as error
+                # because it masks the local variable
+                error = repr(e)
                 self.log.exception("hit by exception:", error)
                 if pluginName:
                     if self.rmsMonitoring:
@@ -357,8 +360,8 @@ def __call__(self):
                                 "host": Network.getFQDN(),
                                 "objectType": "Operation",
                                 "operationType": pluginName,
-                                "objectID": operation.OperationID,
-                                "parentID": operation.RequestID,
+                                "objectID": getattr(operation, "OperationID", 0),
+                                "parentID": getattr(operation, "RequestID", 0),
                                 "status": "Failed",
                                 "nbObject": 1,
                             }
@@ -369,7 +372,7 @@ def __call__(self):
                             "timestamp": int(TimeUtilities.toEpochMilliSeconds()),
                             "host": Network.getFQDN(),
                             "objectType": "Request",
-                            "objectID": operation.RequestID,
+                            "objectID": getattr(operation, "RequestID", 0),
                             "status": "Failed",
                             "nbObject": 1,
                         }
@@ -388,8 +391,8 @@ def __call__(self):
                             "host": Network.getFQDN(),
                             "objectType": "Operation",
                             "operationType": pluginName,
-                            "objectID": operation.OperationID,
-                            "parentID": operation.RequestID,
+                            "objectID": getattr(operation, "OperationID", 0),
+                            "parentID": getattr(operation, "RequestID", 0),
                             "status": "Successful",
                             "nbObject": 1,
                         }
@@ -402,8 +405,8 @@ def __call__(self):
                             "host": Network.getFQDN(),
                             "objectType": "Operation",
                             "operationType": pluginName,
-                            "objectID": operation.OperationID,
-                            "parentID": operation.RequestID,
+                            "objectID": getattr(operation, "OperationID", 0),
+                            "parentID": getattr(operation, "RequestID", 0),
                             "status": "Failed",
                             "nbObject": 1,
                         }