Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 4 additions & 3 deletions lib/private/Files/Cache/Storage.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
namespace OC\Files\Cache;

use OC\DB\Exceptions\DbalException;
use OC\Files\Storage\Wrapper\Availability;
use OCP\DB\QueryBuilder\IQueryBuilder;
use OCP\Files\Storage\IStorage;
use OCP\FilesMetadata\IFilesMetadataManager;
Expand Down Expand Up @@ -142,9 +143,9 @@ public function getAvailability(): array {
}

/**
* @param int $delay amount of seconds to delay reconsidering that storage further
* @param int $additionalDelay additional delay - {@see Availability::shouldRecheck()} already waits {@see Availability::RECHECK_TTL_SEC}
*/
public function setAvailability(bool $isAvailable, int $delay = 0): void {
public function setAvailability(bool $isAvailable, int $additionalDelay = 0): void {
$available = $isAvailable ? 1 : 0;
if (!$isAvailable) {
Server::get(LoggerInterface::class)->info('Storage with ' . $this->storageId . ' marked as unavailable', ['app' => 'lib']);
Expand All @@ -153,7 +154,7 @@ public function setAvailability(bool $isAvailable, int $delay = 0): void {
$query = Server::get(IDBConnection::class)->getQueryBuilder();
$query->update('storages')
->set('available', $query->createNamedParameter($available))
->set('last_checked', $query->createNamedParameter(time() + $delay))
->set('last_checked', $query->createNamedParameter(time() + $additionalDelay))
->where($query->expr()->eq('id', $query->createNamedParameter($this->storageId)));
$query->executeStatement();
}
Expand Down
10 changes: 3 additions & 7 deletions lib/private/Files/Storage/Wrapper/Availability.php
Original file line number Diff line number Diff line change
Expand Up @@ -294,16 +294,12 @@ public function getMetaData(string $path): ?array {
* @throws StorageNotAvailableException
*/
protected function setUnavailable(?StorageNotAvailableException $e): void {
$delay = self::RECHECK_TTL_SEC;
$additionalDelay = 0;
if ($e instanceof StorageAuthException) {
$delay = max(
// 30min
$this->config->getSystemValueInt('external_storage.auth_availability_delay', 1800),
self::RECHECK_TTL_SEC
);
$additionalDelay = max($this->config->getSystemValueInt('external_storage.auth_availability_delay', 1800) - self::RECHECK_TTL_SEC, 0);
}
$this->available = false;
$this->getStorageCache()->setAvailability(false, $delay);
$this->getStorageCache()->setAvailability(false, $additionalDelay);
if ($e !== null) {
throw $e;
}
Expand Down
Loading