bug #47497 [Bridge] Fix mkdir() race condition in ProxyCacheWarmer (andrey-tech)

nicolas-grekas · nicolas-grekas · commit b0b7ae97a815 · 2022-09-06T15:21:04.000+02:00
This PR was merged into the 4.4 branch. Discussion ---------- [Bridge] Fix mkdir() race condition in ProxyCacheWarmer | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix [#47489](#47489) | License | MIT | Doc PR | - The race condition is appears when several processes are attempting to create a same Doctrine Proxy directory which does not yet exist and `\RuntimeException` is thrown in `\Symfony\Bridge\Doctrine\CacheWarmer\ProxyCacheWarmer`. This PR adds an extra check to `\Symfony\Bridge\Doctrine\CacheWarmer\ProxyCacheWarmer`. Commits ------- cdb6c15 [Bridge] Fix mkdir() race condition in ProxyCacheWarmer
diff --git a/src/Symfony/Bridge/Doctrine/CacheWarmer/ProxyCacheWarmer.php b/src/Symfony/Bridge/Doctrine/CacheWarmer/ProxyCacheWarmer.php
@@ -49,7 +49,7 @@ public function warmUp($cacheDir)
         foreach ($this->registry->getManagers() as $em) {
             // we need the directory no matter the proxy cache generation strategy
             if (!is_dir($proxyCacheDir = $em->getConfiguration()->getProxyDir())) {
-                if (false === @mkdir($proxyCacheDir, 0777, true)) {
+                if (false === @mkdir($proxyCacheDir, 0777, true) && !is_dir($proxyCacheDir)) {
                     throw new \RuntimeException(sprintf('Unable to create the Doctrine Proxy directory "%s".', $proxyCacheDir));
                 }
             } elseif (!is_writable($proxyCacheDir)) {

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public function warmUp($cacheDir)`
`49`	`49`	`foreach ($this->registry->getManagers() as $em) {`
`50`	`50`	`// we need the directory no matter the proxy cache generation strategy`
`51`	`51`	`if (!is_dir($proxyCacheDir = $em->getConfiguration()->getProxyDir())) {`
`52`		`- if (false === @mkdir($proxyCacheDir, 0777, true)) {`
	`52`	`+ if (false === @mkdir($proxyCacheDir, 0777, true) && !is_dir($proxyCacheDir)) {`
`53`	`53`	`throw new \RuntimeException(sprintf('Unable to create the Doctrine Proxy directory "%s".', $proxyCacheDir));`
`54`	`54`	`}`
`55`	`55`	`} elseif (!is_writable($proxyCacheDir)) {`