diff options
| -rw-r--r-- | apps/theming/css/default.css | 3 | ||||
| -rw-r--r-- | apps/theming/lib/Themes/DefaultTheme.php | 3 | ||||
| -rw-r--r-- | lib/private/Avatar/AvatarManager.php | 9 | ||||
| -rw-r--r-- | lib/private/Repair/ClearGeneratedAvatarCache.php | 7 | ||||
| -rw-r--r-- | lib/public/AppFramework/Db/TTransactional.php | 37 | ||||
| -rw-r--r-- | tests/lib/Repair/ClearGeneratedAvatarCacheTest.php | 2 |
6 files changed, 50 insertions, 11 deletions
diff --git a/apps/theming/css/default.css b/apps/theming/css/default.css index da9ad6e97de..ac7c67c8408 100644 --- a/apps/theming/css/default.css +++ b/apps/theming/css/default.css @@ -26,6 +26,9 @@ --color-success: #46ba61; --color-success-rgb: 70,186,97; --color-success-hover: #6ac780; + --color-info: #006aa3; + --color-info-rgb: 0,106,163; + --color-info-hover: #3287b5; --color-loading-light: #cccccc; --color-loading-dark: #444444; --color-box-shadow-rgb: 77,77,77; diff --git a/apps/theming/lib/Themes/DefaultTheme.php b/apps/theming/lib/Themes/DefaultTheme.php index cb4ed510068..0a4ac44afb6 100644 --- a/apps/theming/lib/Themes/DefaultTheme.php +++ b/apps/theming/lib/Themes/DefaultTheme.php @@ -147,6 +147,9 @@ class DefaultTheme implements ITheme { '--color-success' => '#46ba61', '--color-success-rgb' => join(',', $this->util->hexToRGB('#46ba61')), '--color-success-hover' => $this->util->mix('#46ba61', $colorMainBackground, 60), + '--color-info' => '#006aa3', + '--color-info-rgb' => join(',', $this->util->hexToRGB('#006aa3')), + '--color-info-hover' => $this->util->mix('#006aa3', $colorMainBackground, 60), // used for the icon loading animation '--color-loading-light' => '#cccccc', diff --git a/lib/private/Avatar/AvatarManager.php b/lib/private/Avatar/AvatarManager.php index 5c4f04de6d6..4125c8eb0a8 100644 --- a/lib/private/Avatar/AvatarManager.php +++ b/lib/private/Avatar/AvatarManager.php @@ -160,13 +160,8 @@ class AvatarManager implements IAvatarManager { public function clearCachedAvatars() { $users = $this->config->getUsersForUserValue('avatar', 'generated', 'true'); foreach ($users as $userId) { - try { - $folder = $this->appData->getFolder($userId); - $folder->delete(); - } catch (NotFoundException $e) { - $this->logger->debug("No cache for the user $userId. Ignoring..."); - } - $this->config->setUserValue($userId, 'avatar', 'generated', 'false'); + // This also bumps the avatar version leading to cache invalidation in browsers + $this->getAvatar($userId)->remove(); } } diff --git a/lib/private/Repair/ClearGeneratedAvatarCache.php b/lib/private/Repair/ClearGeneratedAvatarCache.php index 844bf6cf346..fb3b42847dc 100644 --- a/lib/private/Repair/ClearGeneratedAvatarCache.php +++ b/lib/private/Repair/ClearGeneratedAvatarCache.php @@ -42,7 +42,7 @@ class ClearGeneratedAvatarCache implements IRepairStep { } public function getName(): string { - return 'Clear every generated avatar on major updates'; + return 'Clear every generated avatar'; } /** @@ -51,8 +51,9 @@ class ClearGeneratedAvatarCache implements IRepairStep { private function shouldRun(): bool { $versionFromBeforeUpdate = $this->config->getSystemValueString('version', '0.0.0.0'); - // was added to 25.0.0.10 - return version_compare($versionFromBeforeUpdate, '25.0.0.10', '<='); + // This job only runs if the server was on a version lower than or equal to 27.0.0 before the upgrade. + // To clear the avatar cache again, bump the version to the currently released version (and change the operator to <= if it's not the master branch) and wait for the next release. + return version_compare($versionFromBeforeUpdate, '27.0.0', '<'); } public function run(IOutput $output): void { diff --git a/lib/public/AppFramework/Db/TTransactional.php b/lib/public/AppFramework/Db/TTransactional.php index 1e02a129e69..56daef1d62a 100644 --- a/lib/public/AppFramework/Db/TTransactional.php +++ b/lib/public/AppFramework/Db/TTransactional.php @@ -25,9 +25,11 @@ declare(strict_types=1); namespace OCP\AppFramework\Db; +use OC\DB\Exceptions\DbalException; use OCP\DB\Exception; use OCP\IDBConnection; use Throwable; +use function OCP\Log\logger; /** * Helper trait for transactional operations @@ -66,4 +68,39 @@ trait TTransactional { throw $e; } } + + /** + * Wrapper around atomic() to retry after a retryable exception occurred + * + * Certain transactions might need to be retried. This is especially useful + * in highly concurrent requests where a deadlocks is thrown by the database + * without waiting for the lock to be freed (e.g. due to MySQL/MariaDB deadlock + * detection) + * + * @template T + * @param callable $fn + * @psalm-param callable():T $fn + * @param IDBConnection $db + * @param int $maxRetries + * + * @return mixed the result of the passed callable + * @psalm-return T + * + * @throws Exception for possible errors of commit or rollback or the custom operations within the closure + * @throws Throwable any other error caused by the closure + * + * @since 27.0.0 + */ + protected function atomicRetry(callable $fn, IDBConnection $db, int $maxRetries = 3): mixed { + for ($i = 0; $i < $maxRetries; $i++) { + try { + return $this->atomic($fn, $db); + } catch (DbalException $e) { + if (!$e->isRetryable() || $i === ($maxRetries - 1)) { + throw $e; + } + logger('core')->warning('Retrying operation after retryable exception.', [ 'exception' => $e ]); + } + } + } } diff --git a/tests/lib/Repair/ClearGeneratedAvatarCacheTest.php b/tests/lib/Repair/ClearGeneratedAvatarCacheTest.php index 44fc709c72a..0e3347cd5ac 100644 --- a/tests/lib/Repair/ClearGeneratedAvatarCacheTest.php +++ b/tests/lib/Repair/ClearGeneratedAvatarCacheTest.php @@ -61,7 +61,7 @@ class ClearGeneratedAvatarCacheTest extends \Test\TestCase { ['15.0.0.3', true], ['13.0.5.2', true], ['12.0.0.0', true], - ['26.0.0.1', false], + ['26.0.0.1', true], ['15.0.0.2', true], ['13.0.0.0', true], ['27.0.0.5', false] |