add locked files to the end of the index queue

Signed-off-by: Anupam Kumar <[email protected]>

lib/BackgroundJobs/IndexerJob.php

@@ -135,6 +135,7 @@ protected function index(array $files): void {
 		$sources = [];
 		$allSourceIds = [];
 		$loadedSources = [];
+		$retryQFiles = [];
 		$size = 0;
 
 		foreach ($files as $queueFile) {
@@ -161,9 +162,13 @@ protected function index(array $files): void {
 			try {
 				try {
 					$fileHandle = $file->fopen('r');
-				} catch (LockedException|NotPermittedException $e) {
+				} catch (NotPermittedException $e) {
 					$this->logger->error('Could not open file ' . $file->getPath() . ' for reading', ['exception' => $e]);
 					continue;
+				} catch (LockedException $e) {
+					$retryQFiles[] = $queueFile;
+					$this->logger->info('File ' . $file->getPath() . ' is locked, could not read for indexing. Adding it to the next batch.');
+					continue;
 				}
 				if (!is_resource($fileHandle)) {
 					$this->logger->warning('File handle for' . $file->getPath() . ' is not readable');
@@ -197,6 +202,10 @@ protected function index(array $files): void {
 
 		try {
 			$this->queue->removeFromQueue($files);
+			// add files that were locked to the end of the queue
+			foreach ($retryQFiles as $queueFile) {
+				$this->queue->insertIntoQueue($queueFile);
+			}
 		} catch (Exception $e) {
 			$this->logger->error('Could not remove indexed files from queue', ['exception' => $e]);
 		}