Skip to content

[stable26] ignore errors while trying to update parent storage_mtime #37875

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

Merged
szaimen merged 1 commit into from
Apr 27, 2023
Merged

[stable26] ignore errors while trying to update parent storage_mtime #37875

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
ignore errors while trying to update parent storage_mtime 
in the worst case this should only cause an extra rescan later

Signed-off-by: Robin Appelman <robin@icewind.nl>
  • Loading branch information
@icewind1991 @backportbot-nextcloud
icewind1991 authored and backportbot-nextcloud[bot] committed Apr 21, 2023
commit a7b4d7bdc20be51b8dd0067f07eeb5d50dc95c0c
14 changes: 13 additions & 1 deletion lib/private/Files/Cache/Updater.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -62,6 +64,8 @@ class Updater implements IUpdater {
*/
protected $cache;

private LoggerInterface $logger;

/**
* @param \OC\Files\Storage\Storage $storage
*/
Expand All @@ -70,6 +74,7 @@ public function __construct(\OC\Files\Storage\Storage $storage) {
$this->propagator = $storage->getPropagator();
$this->scanner = $storage->getScanner();
$this->cache = $storage->getCache();
$this->logger = \OC::$server->get(LoggerInterface::class);
}

/**
Expand Down Expand Up @@ -253,7 +258,14 @@ private function correctParentStorageMtime($internalPath) {
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]);
}
}
}
}
Expand Down