Put storage cache initalization in a transaction

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
nextcloud · Dec 13, 2022 · 1c595d8 · 1c595d8
1 parent 104a109
commit 1c595d8
Showing 1 changed file with 25 additions and 13 deletions.
diff --git a/lib/private/Files/Cache/Storage.php b/lib/private/Files/Cache/Storage.php
@@ -29,8 +29,11 @@
  */
 namespace OC\Files\Cache;
 
+use Doctrine\DBAL\Exception\UniqueConstraintViolationException;
+use OCP\AppFramework\Db\TTransactional;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\Files\Storage\IStorage;
+use OCP\IDBConnection;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -50,6 +53,8 @@ class Storage {
 	private $storageId;
 	private $numericId;
 
+	use TTransactional;
+
 	/**
 	 * @return StorageGlobal
 	 */
@@ -65,29 +70,36 @@ public static function getGlobalCache() {
 	 * @param bool $isAvailable
 	 * @throws \RuntimeException
 	 */
-	public function __construct($storage, $isAvailable = true) {
+	public function __construct($storage, bool $isAvailable = true) {
 		if ($storage instanceof IStorage) {
 			$this->storageId = $storage->getId();
 		} else {
 			$this->storageId = $storage;
 		}
 		$this->storageId = self::adjustStorageId($this->storageId);
 
-		if ($row = self::getStorageById($this->storageId)) {
-			$this->numericId = (int)$row['numeric_id'];
-		} else {
-			$connection = \OC::$server->getDatabaseConnection();
-			$available = $isAvailable ? 1 : 0;
-			if ($connection->insertIfNotExist('*PREFIX*storages', ['id' => $this->storageId, 'available' => $available])) {
-				$this->numericId = $connection->lastInsertId('*PREFIX*storages');
+		$dbConnection = \OC::$server->get(IDBConnection::class);
+
+		$this->numericId = $this->atomic(function () use ($isAvailable, $dbConnection) {
+			if ($row = self::getStorageById($this->storageId)) {
+				return (int)$row['numeric_id'];
 			} else {
-				if ($row = self::getStorageById($this->storageId)) {
-					$this->numericId = (int)$row['numeric_id'];
-				} else {
-					throw new \RuntimeException('Storage could neither be inserted nor be selected from the database: ' . $this->storageId);
+				$qb = $dbConnection->getQueryBuilder();
+				try {
+					$qb->insert('storages')
+						->values(['id' => $qb->createNamedParameter($this->storageId), 'available' => $qb->createNamedParameter($isAvailable ? 1 : 0)])
+						->executeStatement();
+					return $qb->getLastInsertId();
+				} catch (UniqueConstraintViolationException $e) {
+					// If a storage already exists with this ID, return it
+					if ($row = self::getStorageById($this->storageId)) {
+						return (int)$row['numeric_id'];
+					} else {
+						throw new \RuntimeException('Storage could neither be inserted nor be selected from the database: ' . $this->storageId);
+					}
 				}
 			}
-		}
+		}, $dbConnection);
 	}
 
 	/**