[Cache] fix warming up cache.system and apcu #30331

nicolas-grekas · 2019-02-21T13:33:08Z

Q	A
Branch?	4.2
Bug fix?	yes
New feature?	no
BC breaks?	no
Deprecations?	no
Tests pass?	yes
Fixed tickets	#29601, #29877
License	MIT
Doc PR	-

bendavies · 2019-02-21T13:43:24Z

src/Symfony/Component/Cache/Adapter/AbstractAdapter.php

@@ -108,16 +108,12 @@ function ($deferred, $namespace, &$expiredIds) use ($getId) {
     */
    public static function createSystemCache($namespace, $defaultLifetime, $version, $directory, LoggerInterface $logger = null)
    {
-        if (null === self::$apcuSupported) {
-            self::$apcuSupported = ApcuAdapter::isSupported();
+        $opcache = new PhpFilesAdapter($namespace, $defaultLifetime, $directory, true);


no PhpFilesAdapter::isSupported(); falling back to FilesystemAdapter?

Nope, unconditional is simpler and we don't care if you don't have opcache :)

but, if the user does not have opcache or apcu, then you get no caching at all? possible hard to debug? up to the user to manually configure?

just looked at it does sort of fallback to filesystem in 4.1 FYI

symfony/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php

Lines 89 to 123 in a57ce22

public static function createSystemCache($namespace, $defaultLifetime, $version, $directory, LoggerInterface $logger = null)

{

if (null === self::$apcuSupported) {

self::$apcuSupported = ApcuAdapter::isSupported();

}

if (!self::$apcuSupported && null === self::$phpFilesSupported) {

self::$phpFilesSupported = PhpFilesAdapter::isSupported();

}

if (self::$phpFilesSupported) {

$opcache = new PhpFilesAdapter($namespace, $defaultLifetime, $directory);

if (null !== $logger) {

$opcache->setLogger($logger);

}

return $opcache;

}

$fs = new FilesystemAdapter($namespace, $defaultLifetime, $directory);

if (null !== $logger) {

$fs->setLogger($logger);

}

if (!self::$apcuSupported) {

return $fs;

}

$apcu = new ApcuAdapter($namespace, (int) $defaultLifetime / 5, $version);

if ('cli' === \PHP_SAPI && !filter_var(ini_get('apc.enable_cli'), FILTER_VALIDATE_BOOLEAN)) {

$apcu->setLogger(new NullLogger());

} elseif (null !== $logger) {

$apcu->setLogger($logger);

}

return new ChainAdapter([$apcu, $fs]);

if you don't have opcache, you don't care about that

no opcache means you will still have the cache - but php will parse the files all the time

ah yes! gotcha.

dkarlovi · 2019-02-21T17:34:44Z

Maybe related? #29877

dkarlovi

Confirming this fix brings back my test suite runtime from 4.2 amount (9:25) back to 4.1 amount (4:10).

Since it's a regression, a test is probably required to avoid having it reappear?

nicolas-grekas · 2019-02-22T14:46:24Z

I don't think a test case would have prevented the change - I would have changed the tests at the time actually.

Tobion · 2019-02-22T17:04:16Z

src/Symfony/Component/Cache/Adapter/AbstractAdapter.php

@@ -108,16 +108,12 @@ function ($deferred, $namespace, &$expiredIds) use ($getId) {
     */
    public static function createSystemCache($namespace, $defaultLifetime, $version, $directory, LoggerInterface $logger = null)


Returns an ApcuAdapter if supported, a PhpFilesAdapter otherwise.

Does not seem to be precise anymore.

dkarlovi · 2019-02-22T17:55:14Z

I meant adding a test would prevent a future regression.

Also, this doesn't seem to fix #29877 since that issue is due to incorrectly detecting APCu in CLI.

This PR was merged into the 4.2 branch. Discussion ---------- [Cache] fix warming up cache.system and apcu | Q | A | ------------- | --- | Branch? | 4.2 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #29601, #29877 | License | MIT | Doc PR | - Commits ------- b0a85ad [Cache] fix warming up cache.system and apcu

nicolas-grekas added this to the 4.2 milestone Feb 21, 2019

carsonbot added Status: Needs Review Bug labels Feb 21, 2019

nicolas-grekas changed the base branch from master to 4.2 February 21, 2019 13:36

nicolas-grekas force-pushed the cache-system branch from 0564302 to 70b6994 Compare February 21, 2019 13:37

bendavies reviewed Feb 21, 2019

View reviewed changes

nicolas-grekas changed the title ~~Cache system~~ [Cache] fix warming up cache.system and apcu Feb 21, 2019

xabbuh approved these changes Feb 21, 2019

View reviewed changes

carsonbot added Status: Reviewed and removed Status: Needs Review labels Feb 21, 2019

dkarlovi suggested changes Feb 22, 2019

View reviewed changes

carsonbot added Status: Needs Work and removed Status: Reviewed labels Feb 22, 2019

nicolas-grekas added Status: Reviewed and removed Status: Needs Work labels Feb 22, 2019

Tobion reviewed Feb 22, 2019

View reviewed changes

Tobion approved these changes Feb 22, 2019

View reviewed changes

[Cache] fix warming up cache.system and apcu

b0a85ad

nicolas-grekas force-pushed the cache-system branch from 70b6994 to b0a85ad Compare February 23, 2019 14:35

nicolas-grekas merged commit b0a85ad into symfony:4.2 Feb 23, 2019

nicolas-grekas deleted the cache-system branch February 23, 2019 16:37

fabpot mentioned this pull request Mar 3, 2019

Release v4.2.4 #30431

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Cache] fix warming up cache.system and apcu #30331

[Cache] fix warming up cache.system and apcu #30331

nicolas-grekas commented Feb 21, 2019 •

edited

Loading

bendavies Feb 21, 2019

nicolas-grekas Feb 21, 2019

bendavies Feb 21, 2019

bendavies Feb 21, 2019 •

edited

Loading

nicolas-grekas Feb 21, 2019

nicolas-grekas Feb 21, 2019

bendavies Feb 21, 2019

dkarlovi commented Feb 21, 2019

dkarlovi left a comment

nicolas-grekas commented Feb 22, 2019

Tobion Feb 22, 2019

dkarlovi commented Feb 22, 2019

	public static function createSystemCache($namespace, $defaultLifetime, $version, $directory, LoggerInterface $logger = null)
	{
	if (null === self::$apcuSupported) {
	self::$apcuSupported = ApcuAdapter::isSupported();
	}

	if (!self::$apcuSupported && null === self::$phpFilesSupported) {
	self::$phpFilesSupported = PhpFilesAdapter::isSupported();
	}

	if (self::$phpFilesSupported) {
	$opcache = new PhpFilesAdapter($namespace, $defaultLifetime, $directory);
	if (null !== $logger) {
	$opcache->setLogger($logger);
	}

	return $opcache;
	}

	$fs = new FilesystemAdapter($namespace, $defaultLifetime, $directory);
	if (null !== $logger) {
	$fs->setLogger($logger);
	}
	if (!self::$apcuSupported) {
	return $fs;
	}

	$apcu = new ApcuAdapter($namespace, (int) $defaultLifetime / 5, $version);
	if ('cli' === \PHP_SAPI && !filter_var(ini_get('apc.enable_cli'), FILTER_VALIDATE_BOOLEAN)) {
	$apcu->setLogger(new NullLogger());
	} elseif (null !== $logger) {
	$apcu->setLogger($logger);
	}

	return new ChainAdapter([$apcu, $fs]);

		@@ -108,16 +108,12 @@ function ($deferred, $namespace, &$expiredIds) use ($getId) {
		*/
		public static function createSystemCache($namespace, $defaultLifetime, $version, $directory, LoggerInterface $logger = null)

[Cache] fix warming up cache.system and apcu #30331

[Cache] fix warming up cache.system and apcu #30331

Conversation

nicolas-grekas commented Feb 21, 2019 • edited Loading

bendavies Feb 21, 2019

Choose a reason for hiding this comment

nicolas-grekas Feb 21, 2019

Choose a reason for hiding this comment

bendavies Feb 21, 2019

Choose a reason for hiding this comment

bendavies Feb 21, 2019 • edited Loading

Choose a reason for hiding this comment

nicolas-grekas Feb 21, 2019

Choose a reason for hiding this comment

nicolas-grekas Feb 21, 2019

Choose a reason for hiding this comment

bendavies Feb 21, 2019

Choose a reason for hiding this comment

dkarlovi commented Feb 21, 2019

dkarlovi left a comment

Choose a reason for hiding this comment

nicolas-grekas commented Feb 22, 2019

Tobion Feb 22, 2019

Choose a reason for hiding this comment

dkarlovi commented Feb 22, 2019

nicolas-grekas commented Feb 21, 2019 •

edited

Loading

bendavies Feb 21, 2019 •

edited

Loading