Merge pull request #13525 from owncloud/s2s-fixscanfileforbrokenstorage

Catch storage exception in scanner for remote shares

1 files changed, 16 insertions, 1 deletions

diff --git a/lib/private/files/view.php b/lib/private/files/view.php
index f466361bd02..096d8044b75 100644
--- a/lib/private/files/view.php
+++ b/lib/private/files/view.php
@@ -1044,7 +1044,22 @@ class View {
 
 					if ($subCache->getStatus('') === Cache\Cache::NOT_FOUND) {
 						$subScanner = $subStorage->getScanner('');
-						$subScanner->scanFile('');
+						try {
+							$subScanner->scanFile('');
+						} catch (\OCP\Files\StorageNotAvailableException $e) {
+							continue;
+						} catch (\OCP\Files\StorageInvalidException $e) {
+							continue;
+						} catch (\Exception $e) {
+							// sometimes when the storage is not available it can be any exception
+							\OCP\Util::writeLog(
+								'core',
+								'Exception while scanning storage "' . $subStorage->getId() . '": ' .
+								get_class($e) . ': ' . $e->getMessage(),
+								\OCP\Util::ERROR
+							);
+							continue;
+						}
 					}
 
 					$rootEntry = $subCache->get('');