Merge pull request #45106 from nextcloud/backport/fix-opcache-buffer-check

come-nc · web-flow · commit 76fa0c3de040 · 2024-04-30T12:07:15.000+02:00
[stable29] fix(setupchecks): Fix opcache buffer check
diff --git a/apps/settings/lib/SetupChecks/PhpOpcacheSetup.php b/apps/settings/lib/SetupChecks/PhpOpcacheSetup.php
@@ -102,9 +102,11 @@ protected function getOpcacheSetupRecommendations(): array {
 				$recommendations[] = $this->l10n->t('The OPcache buffer is nearly full. To assure that all scripts can be hold in cache, it is recommended to apply "opcache.memory_consumption" to your PHP configuration with a value higher than "%s".', [($this->iniGetWrapper->getNumeric('opcache.memory_consumption') ?: 'currently')]);
 			}
 
+			$interned_strings_buffer = $this->iniGetWrapper->getNumeric('opcache.interned_strings_buffer') ?? 0;
+			$memory_consumption = $this->iniGetWrapper->getNumeric('opcache.memory_consumption') ?? 0;
 			if (
 				// Do not recommend to raise the interned strings buffer size above a quarter of the total OPcache size
-				($this->iniGetWrapper->getNumeric('opcache.interned_strings_buffer') ?? $this->iniGetWrapper->getNumeric('opcache.memory_consumption') > 0 ?? 0 / 4) &&
+				($interned_strings_buffer < ($memory_consumption / 4)) &&
 				(
 					empty($status['interned_strings_usage']['free_memory']) ||
 					($status['interned_strings_usage']['used_memory'] / $status['interned_strings_usage']['free_memory'] > 9)

Original file line number	Diff line number	Diff line change
`@@ -102,9 +102,11 @@ protected function getOpcacheSetupRecommendations(): array {`
`102`	`102`	`$recommendations[] = $this->l10n->t('The OPcache buffer is nearly full. To assure that all scripts can be hold in cache, it is recommended to apply "opcache.memory_consumption" to your PHP configuration with a value higher than "%s".', [($this->iniGetWrapper->getNumeric('opcache.memory_consumption') ?: 'currently')]);`
`103`	`103`	`}`
`104`	`104`
	`105`	`+ $interned_strings_buffer = $this->iniGetWrapper->getNumeric('opcache.interned_strings_buffer') ?? 0;`
	`106`	`+ $memory_consumption = $this->iniGetWrapper->getNumeric('opcache.memory_consumption') ?? 0;`
`105`	`107`	`if (`
`106`	`108`	`// Do not recommend to raise the interned strings buffer size above a quarter of the total OPcache size`
`107`		`- ($this->iniGetWrapper->getNumeric('opcache.interned_strings_buffer') ?? $this->iniGetWrapper->getNumeric('opcache.memory_consumption') > 0 ?? 0 / 4) &&`
	`109`	`+ ($interned_strings_buffer < ($memory_consumption / 4)) &&`
`108`	`110`	`(`
`109`	`111`	`empty($status['interned_strings_usage']['free_memory']) \|\|`
`110`	`112`	`($status['interned_strings_usage']['used_memory'] / $status['interned_strings_usage']['free_memory'] > 9)`