Skip to content

Commit

Permalink
Merge pull request #20053 from owncloud/getfileinfo-locking
Browse files Browse the repository at this point in the history 
Don't lock if we're only reading cache metadata
  • Loading branch information
@DeepDiver1975
DeepDiver1975 committed Nov 4, 2015
2 parents 05359e3 + a2cfbd9 commit ba02a37
Show file tree
Hide file tree
Showing 3 changed files with 88 additions and 65 deletions.
52 changes: 26 additions & 26 deletions apps/files_sharing/lib/watcher.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,41 +29,41 @@
* check the storage backends for updates and change the cache accordingly
*/
class Shared_Watcher extends Watcher {
/**
* @var \OC\Files\Storage\Shared $storage
*/
protected $storage;

/**
* check $path for updates
* Update the cache for changes to $path
*
* @param string $path
* @param array $cachedEntry
* @return boolean true if path was updated
* @param array $cachedData
*/
public function checkUpdate($path, $cachedEntry = null) {
if (parent::checkUpdate($path, $cachedEntry) === true) {
// since checkUpdate() has already updated the size of the subdirs,
// only apply the update to the owner's parent dirs

// find last parent before reaching the shared storage root,
// which is the actual shared dir from the owner
$sepPos = strpos($path, '/');
if ($sepPos > 0) {
$baseDir = substr($path, 0, $sepPos);
} else {
$baseDir = $path;
}
public function update($path, $cachedData) {
parent::update($path, $cachedData);
// since parent::update() has already updated the size of the subdirs,
// only apply the update to the owner's parent dirs

// find the path relative to the data dir
$file = $this->storage->getFile($baseDir);
$view = new \OC\Files\View('/' . $file['fileOwner']);
// find last parent before reaching the shared storage root,
// which is the actual shared dir from the owner
$sepPos = strpos($path, '/');
if ($sepPos > 0) {
$baseDir = substr($path, 0, $sepPos);
} else {
$baseDir = $path;
}

// find the owner's storage and path
list($storage, $internalPath) = $view->resolvePath($file['path']);
// find the path relative to the data dir
$file = $this->storage->getFile($baseDir);
$view = new \OC\Files\View('/' . $file['fileOwner']);

// update the parent dirs' sizes in the owner's cache
$storage->getCache()->correctFolderSize(dirname($internalPath));
// find the owner's storage and path
/** @var \OC\Files\Storage\Storage $storage */
list($storage, $internalPath) = $view->resolvePath($file['path']);

return true;
}
return false;
// update the parent dirs' sizes in the owner's cache
$storage->getCache()->correctFolderSize(dirname($internalPath));
}

/**
Expand Down
59 changes: 40 additions & 19 deletions lib/private/files/cache/watcher.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,36 +74,57 @@ public function getPolicy() {
}

/**
* check $path for updates
* check $path for updates and update if needed
*
* @param string $path
* @param array $cachedEntry
* @return boolean true if path was updated
*/
public function checkUpdate($path, $cachedEntry = null) {
if ($this->watchPolicy === self::CHECK_ALWAYS or ($this->watchPolicy === self::CHECK_ONCE and array_search($path, $this->checkedPaths) === false)) {
if (is_null($cachedEntry)) {
$cachedEntry = $this->cache->get($path);
}
$this->checkedPaths[] = $path;
if ($this->storage->hasUpdated($path, $cachedEntry['storage_mtime'])) {
if ($this->storage->is_dir($path)) {
$this->scanner->scan($path, Scanner::SCAN_SHALLOW);
} else {
$this->scanner->scanFile($path);
}
if ($cachedEntry['mimetype'] === 'httpd/unix-directory') {
$this->cleanFolder($path);
}
$this->cache->correctFolderSize($path);
return true;
}
return false;
if (is_null($cachedEntry)) {
$cachedEntry = $this->cache->get($path);
}
if ($this->needsUpdate($path, $cachedEntry)) {
$this->update($path, $cachedEntry);
return true;
} else {
return false;
}
}

/**
* Update the cache for changes to $path
*
* @param string $path
* @param array $cachedData
*/
public function update($path, $cachedData) {
if ($this->storage->is_dir($path)) {
$this->scanner->scan($path, Scanner::SCAN_SHALLOW);
} else {
$this->scanner->scanFile($path);
}
if ($cachedData['mimetype'] === 'httpd/unix-directory') {
$this->cleanFolder($path);
}
$this->cache->correctFolderSize($path);
}

/**
* Check if the cache for $path needs to be updated
*
* @param string $path
* @param array $cachedData
* @return bool
*/
public function needsUpdate($path, $cachedData) {
if ($this->watchPolicy === self::CHECK_ALWAYS or ($this->watchPolicy === self::CHECK_ONCE and array_search($path, $this->checkedPaths) === false)) {
$this->checkedPaths[] = $path;
return $this->storage->hasUpdated($path, $cachedData['storage_mtime']);
}
return false;
}

/**
* remove deleted files in $path from the cache
*
Expand Down
42 changes: 22 additions & 20 deletions lib/private/files/view.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1191,28 +1191,30 @@ public function getFileInfo($path, $includeMountPoints = true) {
if ($storage) {
$cache = $storage->getCache($internalPath);

try {
$this->lockFile($relativePath, ILockingProvider::LOCK_SHARED);
$data = $cache->get($internalPath);
$watcher = $storage->getWatcher($internalPath);
$data = $cache->get($internalPath);
$watcher = $storage->getWatcher($internalPath);

try {
// if the file is not in the cache or needs to be updated, trigger the scanner and reload the data
if (!$data) {
$this->lockFile($relativePath, ILockingProvider::LOCK_SHARED);
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->unlockFile($relativePath, ILockingProvider::LOCK_SHARED);
} else if (!Cache\Scanner::isPartialFile($internalPath) && $watcher->needsUpdate($internalPath, $data)) {
$this->lockFile($relativePath, ILockingProvider::LOCK_SHARED);
$watcher->update($internalPath, $data);
$this->updater->propagate($path);
$data = $cache->get($internalPath);
$this->unlockFile($relativePath, ILockingProvider::LOCK_SHARED);
}
$this->unlockFile($relativePath, ILockingProvider::LOCK_SHARED);
} catch (LockedException $e) {
// dont try to update the cache when the file is locked
$data = $cache->get($internalPath);
// if the file is locked we just use the old cache info
}

if ($data and isset($data['fileid'])) {
Expand Down Expand Up @@ -1278,33 +1280,33 @@ public function getDirectoryContent($directory, $mimetype_filter = '') {
*/
$files = array();

$data = $cache->get($internalPath);
$watcher = $storage->getWatcher($internalPath);
try {
$this->lockFile($directory, ILockingProvider::LOCK_SHARED);

$data = $cache->get($internalPath);
$watcher = $storage->getWatcher($internalPath);
if (!$data or $data['size'] === -1) {
$this->lockFile($directory, ILockingProvider::LOCK_SHARED);
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->unlockFile($directory, ILockingProvider::LOCK_SHARED);
} else if ($watcher->needsUpdate($internalPath, $data)) {
$this->lockFile($directory, ILockingProvider::LOCK_SHARED);
$watcher->update($internalPath, $data);
$this->updater->propagate($path);
$data = $cache->get($internalPath);
$this->unlockFile($directory, ILockingProvider::LOCK_SHARED);
}

$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);
// if the file is locked we just use the old cache info
}

$folderId = $data['fileid'];
$contents = $cache->getFolderContentsById($folderId); //TODO: mimetype_filter

foreach ($contents as $content) {
if ($content['permissions'] === 0) {
$content['permissions'] = $storage->getPermissions($content['path']);
Expand Down

0 comments on commit ba02a37

Please sign in to comment.