Merge pull request #16963 from owncloud/fileinfo-lock
Acquire read lock when getting file or directory info
This commit is contained in:
commit
6697f9524c
|
@ -30,6 +30,7 @@ namespace OC\Connector\Sabre;
|
||||||
use OC\Connector\Sabre\Exception\InvalidPath;
|
use OC\Connector\Sabre\Exception\InvalidPath;
|
||||||
use OC\Connector\Sabre\Exception\FileLocked;
|
use OC\Connector\Sabre\Exception\FileLocked;
|
||||||
use OCP\Lock\LockedException;
|
use OCP\Lock\LockedException;
|
||||||
|
use Sabre\DAV\Exception\Locked;
|
||||||
|
|
||||||
class Directory extends \OC\Connector\Sabre\Node
|
class Directory extends \OC\Connector\Sabre\Node
|
||||||
implements \Sabre\DAV\ICollection, \Sabre\DAV\IQuota {
|
implements \Sabre\DAV\ICollection, \Sabre\DAV\IQuota {
|
||||||
|
@ -191,7 +192,11 @@ class Directory extends \OC\Connector\Sabre\Node
|
||||||
if (!is_null($this->dirContent)) {
|
if (!is_null($this->dirContent)) {
|
||||||
return $this->dirContent;
|
return $this->dirContent;
|
||||||
}
|
}
|
||||||
$folderContent = $this->fileView->getDirectoryContent($this->path);
|
try {
|
||||||
|
$folderContent = $this->fileView->getDirectoryContent($this->path);
|
||||||
|
} catch (LockedException $e) {
|
||||||
|
throw new Locked();
|
||||||
|
}
|
||||||
|
|
||||||
$nodes = array();
|
$nodes = array();
|
||||||
foreach ($folderContent as $info) {
|
foreach ($folderContent as $info) {
|
||||||
|
|
|
@ -150,6 +150,8 @@ class ObjectTree extends \Sabre\DAV\Tree {
|
||||||
throw new \Sabre\DAV\Exception\ServiceUnavailable('Storage not available');
|
throw new \Sabre\DAV\Exception\ServiceUnavailable('Storage not available');
|
||||||
} catch (StorageInvalidException $e) {
|
} catch (StorageInvalidException $e) {
|
||||||
throw new \Sabre\DAV\Exception\NotFound('Storage ' . $path . ' is invalid');
|
throw new \Sabre\DAV\Exception\NotFound('Storage ' . $path . ' is invalid');
|
||||||
|
} catch (LockedException $e) {
|
||||||
|
throw new \Sabre\DAV\Exception\Locked();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -988,7 +988,7 @@ class View {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(in_array('write', $hooks) || in_array('delete', $hooks) || in_array('read', $hooks)) {
|
if (in_array('write', $hooks) || in_array('delete', $hooks) || in_array('read', $hooks)) {
|
||||||
// always a shared lock during pre-hooks so the hook can read the file
|
// always a shared lock during pre-hooks so the hook can read the file
|
||||||
$this->lockFile($path, ILockingProvider::LOCK_SHARED);
|
$this->lockFile($path, ILockingProvider::LOCK_SHARED);
|
||||||
}
|
}
|
||||||
|
@ -1148,6 +1148,7 @@ class View {
|
||||||
if (Cache\Scanner::isPartialFile($path)) {
|
if (Cache\Scanner::isPartialFile($path)) {
|
||||||
return $this->getPartFileInfo($path);
|
return $this->getPartFileInfo($path);
|
||||||
}
|
}
|
||||||
|
$relativePath = $path;
|
||||||
$path = Filesystem::normalizePath($this->fakeRoot . '/' . $path);
|
$path = Filesystem::normalizePath($this->fakeRoot . '/' . $path);
|
||||||
|
|
||||||
$mount = Filesystem::getMountManager()->find($path);
|
$mount = Filesystem::getMountManager()->find($path);
|
||||||
|
@ -1157,19 +1158,27 @@ class View {
|
||||||
if ($storage) {
|
if ($storage) {
|
||||||
$cache = $storage->getCache($internalPath);
|
$cache = $storage->getCache($internalPath);
|
||||||
|
|
||||||
$data = $cache->get($internalPath);
|
try {
|
||||||
$watcher = $storage->getWatcher($internalPath);
|
$this->lockFile($relativePath, ILockingProvider::LOCK_SHARED);
|
||||||
|
|
||||||
// if the file is not in the cache or needs to be updated, trigger the scanner and reload the data
|
|
||||||
if (!$data) {
|
|
||||||
if (!$storage->file_exists($internalPath)) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
$scanner = $storage->getScanner($internalPath);
|
|
||||||
$scanner->scan($internalPath, Cache\Scanner::SCAN_SHALLOW);
|
|
||||||
$data = $cache->get($internalPath);
|
$data = $cache->get($internalPath);
|
||||||
} else if (!Cache\Scanner::isPartialFile($internalPath) && $watcher->checkUpdate($internalPath, $data)) {
|
$watcher = $storage->getWatcher($internalPath);
|
||||||
$this->updater->propagate($path);
|
|
||||||
|
// if the file is not in the cache or needs to be updated, trigger the scanner and reload the data
|
||||||
|
if (!$data) {
|
||||||
|
if (!$storage->file_exists($internalPath)) {
|
||||||
|
$this->unlockFile($relativePath, ILockingProvider::LOCK_SHARED);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
$scanner = $storage->getScanner($internalPath);
|
||||||
|
$scanner->scan($internalPath, Cache\Scanner::SCAN_SHALLOW);
|
||||||
|
$data = $cache->get($internalPath);
|
||||||
|
} else if (!Cache\Scanner::isPartialFile($internalPath) && $watcher->checkUpdate($internalPath, $data)) {
|
||||||
|
$this->updater->propagate($path);
|
||||||
|
$data = $cache->get($internalPath);
|
||||||
|
}
|
||||||
|
$this->unlockFile($relativePath, ILockingProvider::LOCK_SHARED);
|
||||||
|
} catch (LockedException $e) {
|
||||||
|
// dont try to update the cache when the file is locked
|
||||||
$data = $cache->get($internalPath);
|
$data = $cache->get($internalPath);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1231,26 +1240,38 @@ class View {
|
||||||
$cache = $storage->getCache($internalPath);
|
$cache = $storage->getCache($internalPath);
|
||||||
$user = \OC_User::getUser();
|
$user = \OC_User::getUser();
|
||||||
|
|
||||||
$data = $cache->get($internalPath);
|
|
||||||
$watcher = $storage->getWatcher($internalPath);
|
|
||||||
if (!$data or $data['size'] === -1) {
|
|
||||||
if (!$storage->file_exists($internalPath)) {
|
|
||||||
return array();
|
|
||||||
}
|
|
||||||
$scanner = $storage->getScanner($internalPath);
|
|
||||||
$scanner->scan($internalPath, Cache\Scanner::SCAN_SHALLOW);
|
|
||||||
$data = $cache->get($internalPath);
|
|
||||||
} else if ($watcher->checkUpdate($internalPath, $data)) {
|
|
||||||
$this->updater->propagate($path);
|
|
||||||
$data = $cache->get($internalPath);
|
|
||||||
}
|
|
||||||
|
|
||||||
$folderId = $data['fileid'];
|
|
||||||
/**
|
/**
|
||||||
* @var \OC\Files\FileInfo[] $files
|
* @var \OC\Files\FileInfo[] $files
|
||||||
*/
|
*/
|
||||||
$files = array();
|
$files = array();
|
||||||
$contents = $cache->getFolderContentsById($folderId); //TODO: mimetype_filter
|
|
||||||
|
try {
|
||||||
|
$this->lockFile($directory, ILockingProvider::LOCK_SHARED);
|
||||||
|
|
||||||
|
$data = $cache->get($internalPath);
|
||||||
|
$watcher = $storage->getWatcher($internalPath);
|
||||||
|
if (!$data or $data['size'] === -1) {
|
||||||
|
if (!$storage->file_exists($internalPath)) {
|
||||||
|
$this->unlockFile($directory, ILockingProvider::LOCK_SHARED);
|
||||||
|
return array();
|
||||||
|
}
|
||||||
|
$scanner = $storage->getScanner($internalPath);
|
||||||
|
$scanner->scan($internalPath, Cache\Scanner::SCAN_SHALLOW);
|
||||||
|
$data = $cache->get($internalPath);
|
||||||
|
} else if ($watcher->checkUpdate($internalPath, $data)) {
|
||||||
|
$this->updater->propagate($path);
|
||||||
|
$data = $cache->get($internalPath);
|
||||||
|
}
|
||||||
|
|
||||||
|
$folderId = $data['fileid'];
|
||||||
|
$contents = $cache->getFolderContentsById($folderId); //TODO: mimetype_filter
|
||||||
|
|
||||||
|
$this->unlockFile($directory, ILockingProvider::LOCK_SHARED);
|
||||||
|
} catch (LockedException $e) {
|
||||||
|
// dont try to update the cache when the file is locked
|
||||||
|
$contents = $cache->getFolderContents($internalPath);
|
||||||
|
}
|
||||||
|
|
||||||
foreach ($contents as $content) {
|
foreach ($contents as $content) {
|
||||||
if ($content['permissions'] === 0) {
|
if ($content['permissions'] === 0) {
|
||||||
$content['permissions'] = $storage->getPermissions($content['path']);
|
$content['permissions'] = $storage->getPermissions($content['path']);
|
||||||
|
|
Loading…
Reference in New Issue