Merge pull request #7098 from DIRACGridBot/cherry-pick-2-2c2fce92b-integration

[sweep:integration] Fix exceptions in StalledJobAgent

Author: chrisburr

src/DIRAC/WorkloadManagementSystem/Agent/StalledJobAgent.py

@@ -340,7 +340,7 @@ def _updateJobStatus(self, job, status, minorStatus=None, force=False):
 
         if not minorStatus:  # Retain last minor status for stalled jobs
             result = self.jobDB.getJobAttributes(job, ["MinorStatus"])
-            if result["OK"]:
+            if result["OK"] and "MinorStatus" in result["Value"]:
                 minorStatus = result["Value"]["MinorStatus"]
             else:
                 self.log.error("Failed getting MinorStatus", "for job %d: %s" % (job, result["Message"]))
@@ -475,6 +475,8 @@ def _checkHeartBeat(self, jobID, jobDict):
                             lastWallTime = value
                     except ValueError:
                         pass
+                if isinstance(heartBeatTime, str):
+                    heartBeatTime = datetime.datetime.strptime(heartBeatTime, "%Y-%m-%d %H:%M:%S")
                 if heartBeatTime > lastHeartBeatTime:
                     lastHeartBeatTime = heartBeatTime