bug #25190 [HttpKernel] Keep legacy container files for concurrent requests (nicolas-grekas)

fabpot · fabpot · commit 1f14f4d8365b · 2017-11-28T18:27:08.000-08:00
This PR was merged into the 3.4 branch. Discussion ---------- [HttpKernel] Keep legacy container files for concurrent requests | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #25177 | License | MIT | Doc PR | - Because concurrent requests might still be using them, old container files should not be removed immediately, but on a next dump of the container. Commits ------- ee3b6fe [HttpKernel] Keep legacy container files for concurrent requests
diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -644,8 +644,19 @@ protected function initializeContainer()
             return;
         }
 
-        if ($oldContainer && get_class($this->container) !== $oldContainer->name) {
-            (new Filesystem())->remove(dirname($oldContainer->getFileName()));
+        if ($oldContainer) {
+            // Because concurrent requests might still be using them,
+            // old container files are not removed immediately,
+            // but on a next dump of the container.
+            $oldContainerDir = dirname($oldContainer->getFileName());
+            foreach (glob(dirname($oldContainerDir).'/*.legacyContainer') as $legacyContainer) {
+                if (@unlink($legacyContainer)) {
+                    (new Filesystem())->remove(substr($legacyContainer, 0, -16));
+                }
+            }
+            if (get_class($this->container) !== $oldContainer->name) {
+                touch($oldContainerDir.'.legacyContainer');
+            }
         }
 
         if ($this->container->has('cache_warmer')) {
diff --git a/src/Symfony/Component/HttpKernel/Tests/KernelTest.php b/src/Symfony/Component/HttpKernel/Tests/KernelTest.php
@@ -832,7 +832,8 @@ public function testKernelReset()
         $kernel->boot();
 
         $this->assertTrue(get_class($kernel->getContainer()) !== $containerClass);
-        $this->assertFileNotExists($containerFile);
+        $this->assertFileExists($containerFile);
+        $this->assertFileExists(dirname($containerFile).'.legacyContainer');
     }
 
     public function testKernelPass()

Original file line number	Diff line number	Diff line change
`@@ -832,7 +832,8 @@ public function testKernelReset()`
`832`	`832`	`$kernel->boot();`
`833`	`833`
`834`	`834`	`$this->assertTrue(get_class($kernel->getContainer()) !== $containerClass);`
`835`		`- $this->assertFileNotExists($containerFile);`
	`835`	`+ $this->assertFileExists($containerFile);`
	`836`	`+ $this->assertFileExists(dirname($containerFile).'.legacyContainer');`
`836`	`837`	`}`
`837`	`838`
`838`	`839`	`public function testKernelPass()`