upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-10 09:13:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 54

Merge pull request #37876 from nextcloud/backport/37820/stable25

Browse source 
[stable25] ignore errors while trying to update parent storage_mtime
This commit is contained in:
Robin Appelman 2023-04-24 17:11:30 +02:00 committed by GitHub
commit d0538bca49
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/private/Files/Cache/Updater.php
View file

@ -27,10 +27,12 @@
*/
namespace OC\Files\Cache;
use OC\DB\Exceptions\DbalException;
use OC\Files\FileInfo;
use OCP\Files\Cache\ICacheEntry;
use OCP\Files\Cache\IUpdater;
use OCP\Files\Storage\IStorage;
use Psr\Log\LoggerInterface;
/**
* Update the cache and propagate changes
@ -62,6 +64,8 @@ class Updater implements IUpdater {
*/
protected $cache;
private LoggerInterface $logger;
/**
* @param \OC\Files\Storage\Storage $storage
*/
@ -70,6 +74,7 @@ class Updater implements IUpdater {
$this->propagator = $storage->getPropagator();
$this->scanner = $storage->getScanner();
$this->cache = $storage->getCache();
$this->logger = \OC::$server->get(LoggerInterface::class);
}
/**
@ -253,7 +258,14 @@ class Updater implements IUpdater {
if ($parentId != -1) {
$mtime = $this->storage->filemtime($parent);
if ($mtime !== false) {
$this->cache->update($parentId, ['storage_mtime' => $mtime]);
try {
$this->cache->update($parentId, ['storage_mtime' => $mtime]);
} catch (DbalException $e) {
// ignore the failure.
// with failures concurrent updates, someone else would have already done it.
// in the worst case the `storage_mtime` isn't updated, which should at most only trigger an extra rescan
$this->logger->warning("Error while updating parent storage_mtime, should be safe to ignore", ['exception' => $e]);
}
}
}
}