Skip to content

perf: cache server checks in local cache, not session #53684

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ChristophWurst wants to merge 3 commits into
base: master
Choose a base branch
from
Open

perf: cache server checks in local cache, not session #53684

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
16727fd
perf: cache server checks in local cache, not session
ChristophWurst Jun 25, 2025
6acb7aa
Merge remote-tracking branch 'origin/master' into perf/cache-server-c…
ChristophWurst May 20, 2026
7013609
fixup! perf: cache server checks in local cache, not session
ChristophWurst May 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions lib/private/legacy/OC_Util.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
use OCP\IConfig;
use OCP\IGroupManager;
use OCP\IRequest;
use OCP\ISession;
use OCP\ICacheFactory;
use OCP\IURLGenerator;
use OCP\IUser;
use OCP\IUserManager;
Expand Down Expand Up @@ -261,6 +261,7 @@ public static function addHeader($tag, $attributes, $text = null, $prepend = fal
*/
public static function checkServer(SystemConfig $config) {
$l = \OC::$server->getL10N('lib');
$localCache = Server::get(ICacheFactory::class)->createLocal('system');
$errors = [];
$CONFIG_DATADIRECTORY = $config->getValue('datadirectory', OC::$SERVERROOT . '/data');

Expand All @@ -269,8 +270,8 @@ public static function checkServer(SystemConfig $config) {
$errors = self::checkDataDirectoryValidity($CONFIG_DATADIRECTORY);
}

// Assume that if checkServer() succeeded before in this session, then all is fine.
if (Server::get(ISession::class)->exists('checkServer_succeeded') && Server::get(ISession::class)->get('checkServer_succeeded')) {
// Skip re-evaluation if everything is fine
if ($localCache->get('checkServer_succeeded') === true) {
return $errors;
}

Expand Down Expand Up @@ -439,8 +440,8 @@ public static function checkServer(SystemConfig $config) {
}
}

// Cache the result of this function
Server::get(ISession::class)->set('checkServer_succeeded', count($errors) == 0);
// Cache the result of this function for an hour
$localCache->set('checkServer_succeeded', $errors === [], 3600);

return $errors;
}
Expand Down
3 changes: 2 additions & 1 deletion tests/lib/UtilCheckServerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
namespace Test;

use OC\SystemConfig;
use OCP\ICacheFactory;
use OCP\ISession;
use OCP\ITempManager;
use OCP\Server;
Expand Down Expand Up @@ -47,7 +48,7 @@ protected function setUp(): void {
$this->datadir = Server::get(ITempManager::class)->getTemporaryFolder();

file_put_contents($this->datadir . '/.ncdata', '# Nextcloud data directory');
Server::get(ISession::class)->set('checkServer_succeeded', false);
Server::get(ICacheFactory::class)->createLocal('system')->set('checkServer_succeeded', false, 10);
}

#[\Override]
Expand Down
Loading