summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2016-05-17 17:03:42 +0200
committerVincent Petry <pvince81@owncloud.com>2016-05-18 13:39:37 +0200
commite0af5263fb8352da39555033bd9555ba773d358a (patch)
tree736fe3dcfd032dee8e5d941d5a3d1a6c5ee73b25
parent765782445a24fb1b239f2a3cd5c7b239ae4f6455 (diff)
downloadnextcloud-server-e0af5263fb8352da39555033bd9555ba773d358a.tar.gz
nextcloud-server-e0af5263fb8352da39555033bd9555ba773d358a.zip
Allow chunk GC mtime tolerance for unfinished part chunks
Whenever part chunks are written, every fwrite in the write loop will reset the mtime to the current mtime. Only at the end will the touch() operation set the mtime to now + ttl, in the future. However the GC code is expecting that every chunk with mtime < now are old and must be deleted. This causes the GC to sometimes delete part chunks in which the write loop is slow. To fix this, a tolerance value is added in the GC code to allow for more time before a part chunk gets deleted.
-rw-r--r--lib/private/Cache/File.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/private/Cache/File.php b/lib/private/Cache/File.php
index 989e05275b7..38f88959bd7 100644
--- a/lib/private/Cache/File.php
+++ b/lib/private/Cache/File.php
@@ -172,7 +172,9 @@ class File implements ICache {
public function gc() {
$storage = $this->getStorage();
if ($storage and $storage->is_dir('/')) {
- $now = time();
+ // extra hour safety, in case of stray part chunks that take longer to write,
+ // because touch() is only called after the chunk was finished
+ $now = time() - 3600;
$dh = $storage->opendir('/');
if (!is_resource($dh)) {
return null;