fix(Scanner): Use time based limit for the transaction

Using the node count does not help if handling a node is slow.

Signed-off-by: Louis Chmn <[email protected]>

Author: artonge

lib/private/Files/Utils/Scanner.php

@@ -16,6 +16,7 @@
 use OC\ForbiddenException;
 use OC\Lock\DBLockingProvider;
 use OCA\Files_Sharing\SharedStorage;
+use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\Files\Events\BeforeFileScannedEvent;
 use OCP\Files\Events\BeforeFolderScannedEvent;
@@ -43,16 +44,14 @@
  *
  * @package OC\Files\Utils
  */
-class Scanner extends PublicEmitter {
+class Scanner {
+	private const int TRANSACTION_SECOND_TIMEOUT = 10;
+
 	/**
 	 * Whether to use a DB transaction
 	 */
 	protected bool $useTransaction;
-
-	/**
-	 * Number of entries scanned to commit
-	 */
-	protected int $entriesToCommit;
+	protected int $transactionStartTime;
 
 	public function __construct(
 		private readonly string $user,
@@ -62,6 +61,7 @@ public function __construct(
 		private readonly SetupManager $setupManager,
 		private readonly IUserManager $userManager,
 		private readonly IEventDispatcher $eventDispatcher,
+		private readonly ITimeFactory $timeFactory,
 	) {
 		// when DB locking is used, no DB transactions will be used
 		$this->useTransaction = !(\OCP\Server::get(ILockingProvider::class) instanceof DBLockingProvider);
@@ -237,6 +237,7 @@ public function scan(string $dir = '', $recursive = \OC\Files\Cache\Scanner::SCA
 			}
 
 			if ($this->useTransaction) {
+				$this->transactionStartTime = $this->timeFactory->getTime();
 				$this->db->beginTransaction();
 			}
 			try {
@@ -273,16 +274,17 @@ private function triggerPropagator(IStorage $storage, $internalPath) {
 
 	private function postProcessEntry(IStorage $storage, $internalPath) {
 		$this->triggerPropagator($storage, $internalPath);
-		if ($this->useTransaction) {
-			$this->entriesToCommit++;
-			if ($this->entriesToCommit >= self::MAX_ENTRIES_TO_COMMIT) {
-				$propagator = $storage->getPropagator();
-				$this->entriesToCommit = 0;
-				$this->db->commit();
-				$propagator->commitBatch();
-				$this->db->beginTransaction();
-				$propagator->beginBatch();
-			}
+
+		if (
+			$this->useTransaction
+			&& $this->transactionStartTime + self::TRANSACTION_SECOND_TIMEOUT >= $this->timeFactory->getTime()
+		) {
+			$propagator = $storage->getPropagator();
+			$this->db->commit();
+			$propagator->commitBatch();
+			$this->db->beginTransaction();
+			$propagator->beginBatch();
+			$this->transactionStartTime = $this->timeFactory->getTime();
 		}
 	}
 }