Merge pull request #1174 from aigarszuika/master

Changed: Clear Doctrine cache before calculate Root Job Status

Author: makasim

pkg/job-queue/CalculateRootJobStatusService.php

@@ -69,6 +69,7 @@ protected function calculateRootJobStatus(array $jobs)
         $success = 0;
 
         foreach ($jobs as $job) {
+            $this->jobStorage->refreshJobEntity($job);
             switch ($job->getStatus()) {
                 case Job::STATUS_NEW:
                     $new++;

pkg/job-queue/Doctrine/JobStorage.php

@@ -58,13 +58,18 @@ public function findJobById($id)
     {
         $qb = $this->getEntityRepository()->createQueryBuilder('job');
 
-        return $qb
+        $job = $qb
             ->addSelect('rootJob')
             ->leftJoin('job.rootJob', 'rootJob')
             ->where('job = :id')
             ->setParameter('id', $id)
             ->getQuery()->getOneOrNullResult()
         ;
+        if ($job) {
+            $this->refreshJobEntity($job);
+        }
+
+        return $job;
     }
 
     /**
@@ -179,6 +184,14 @@ public function saveJob(Job $job, \Closure $lockCallback = null)
         }
     }
 
+    /**
+     * @param Job $job
+     */
+    public function refreshJobEntity($job)
+    {
+        $this->getEntityManager()->refresh($job);
+    }
+
     /**
      * @return EntityRepository
      */