mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #9567 from nextcloud/backport/9395/stable12 

[stable12] cleanup locks in scanner on error
This commit is contained in:
Roeland Jago Douma 2018-05-23 23:04:06 +02:00 committed by GitHub
parent 71bee1b3bd 7c8e34f8fd
commit 3ebed2b9e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/private/Files/Cache/Scanner.php
View File

@ -319,15 +319,18 @@ class Scanner extends BasicEmitter implements IScanner {
$this->storage->acquireLock($path, ILockingProvider::LOCK_SHARED, $this->lockingProvider); $this->storage->acquireLock($path, ILockingProvider::LOCK_SHARED, $this->lockingProvider);
} }
} }
$data = $this->scanFile($path, $reuse, -1, null, $lock); try {
if ($data and $data['mimetype'] === 'httpd/unix-directory') { $data = $this->scanFile($path, $reuse, -1, null, $lock);
$size = $this->scanChildren($path, $recursive, $reuse, $data['fileid'], $lock); if ($data and $data['mimetype'] === 'httpd/unix-directory') {
$data['size'] = $size; $size = $this->scanChildren($path, $recursive, $reuse, $data['fileid'], $lock);
} $data['size'] = $size;
if ($lock) { }
if ($this->storage->instanceOfStorage('\OCP\Files\Storage\ILockingStorage')) { } finally {
$this->storage->releaseLock($path, ILockingProvider::LOCK_SHARED, $this->lockingProvider); if ($lock) {
$this->storage->releaseLock('scanner::' . $path, ILockingProvider::LOCK_EXCLUSIVE, $this->lockingProvider); if ($this->storage->instanceOfStorage('\OCP\Files\Storage\ILockingStorage')) {
$this->storage->releaseLock($path, ILockingProvider::LOCK_SHARED, $this->lockingProvider);
$this->storage->releaseLock('scanner::' . $path, ILockingProvider::LOCK_EXCLUSIVE, $this->lockingProvider);
}
} }
} }
return $data; return $data;