Changed: Clear Doctrine cache before calculate Root Job Status

aigarszuika · aigarszuika · commit 576f057c0c29 · 2021-05-25T17:59:46.000+03:00
Before determine Root Job Status Doctrine cache for Job entity must be cleared, otherwise if this root job was processed in previous request by the same enqueue, then it will falsely return old status, which will cause infinite running root jobs
diff --git a/pkg/job-queue/CalculateRootJobStatusProcessor.php b/pkg/job-queue/CalculateRootJobStatusProcessor.php
@@ -48,6 +48,7 @@ public function __construct(
 
     public function process(Message $message, Context $context)
     {
+        $this->jobStorage->clearJobCache();
         $data = JSON::decode($message->getBody());
 
         if (!isset($data['jobId'])) {
diff --git a/pkg/job-queue/Doctrine/JobStorage.php b/pkg/job-queue/Doctrine/JobStorage.php
@@ -179,6 +179,11 @@ public function saveJob(Job $job, \Closure $lockCallback = null)
         }
     }
 
+    public function clearJobCache()
+    {
+        $this->getEntityManager()->clear($this->entityClass);
+    }
+
     /**
      * @return EntityRepository
      */

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,7 @@ public function __construct(`
`48`	`48`
`49`	`49`	`public function process(Message $message, Context $context)`
`50`	`50`	`{`
	`51`	`+ $this->jobStorage->clearJobCache();`
`51`	`52`	`$data = JSON::decode($message->getBody());`
`52`	`53`
`53`	`54`	`if (!isset($data['jobId'])) {`
Original file line number	Diff line number	Diff line change
`@@ -179,6 +179,11 @@ public function saveJob(Job $job, \Closure $lockCallback = null)`
`179`	`179`	`}`
`180`	`180`	`}`
`181`	`181`
	`182`	`+ public function clearJobCache()`
	`183`	`+ {`
	`184`	`+ $this->getEntityManager()->clear($this->entityClass);`
	`185`	`+ }`
	`186`	`+`
`182`	`187`	`/**`
`183`	`188`	`* @return EntityRepository`
`184`	`189`	`*/`