diff options
author | Vincent Petry <vincent@nextcloud.com> | 2022-09-16 14:39:13 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-09-16 14:39:13 +0200 |
commit | 1025d049c770e0512cc4074d60ed1486668a888e (patch) | |
tree | 8d23e01d4639156845f6d22514c174f3bb6ecce3 | |
parent | b3ca186d2ddaea953d7fec53055947428183b1fd (diff) | |
parent | f41209a0614a317857b77d3be80cd7ef4dbb4695 (diff) | |
download | nextcloud-server-1025d049c770e0512cc4074d60ed1486668a888e.tar.gz nextcloud-server-1025d049c770e0512cc4074d60ed1486668a888e.zip |
Merge pull request #24596 from kofemann/dcache-worm
make NextCloud WORM file system friendly
-rw-r--r-- | config/config.sample.php | 8 | ||||
-rw-r--r-- | lib/private/Files/Storage/Local.php | 14 |
2 files changed, 22 insertions, 0 deletions
diff --git a/config/config.sample.php b/config/config.sample.php index 743d86b12fc..104b3e32546 100644 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -1911,6 +1911,14 @@ $CONFIG = [ 'localstorage.umask' => 0022, /** + * This options allows storage systems that don't allow to modify existing files + * to overcome this limitation by removing the files before overwriting. + * + * Defaults to ``false`` + */ +'localstorage.unlink_on_truncate' => false, + +/** * EXPERIMENTAL: option whether to include external storage in quota * calculation, defaults to false. * diff --git a/lib/private/Files/Storage/Local.php b/lib/private/Files/Storage/Local.php index 4996572a40e..2a7e30cada6 100644 --- a/lib/private/Files/Storage/Local.php +++ b/lib/private/Files/Storage/Local.php @@ -69,6 +69,8 @@ class Local extends \OC\Files\Storage\Common { private $defUMask; + protected bool $unlinkOnTruncate; + public function __construct($arguments) { if (!isset($arguments['datadir']) || !is_string($arguments['datadir'])) { throw new \InvalidArgumentException('No data directory set for local storage'); @@ -88,6 +90,9 @@ class Local extends \OC\Files\Storage\Common { $this->config = \OC::$server->get(IConfig::class); $this->mimeTypeDetector = \OC::$server->get(IMimeTypeDetector::class); $this->defUMask = $this->config->getSystemValue('localstorage.umask', 0022); + + // support Write-Once-Read-Many file systems + $this->unlinkOnTruncate = $this->config->getSystemValue('localstorage.unlink_on_truncate', false); } public function __destruct() { @@ -297,6 +302,9 @@ class Local extends \OC\Files\Storage\Common { public function file_put_contents($path, $data) { $oldMask = umask($this->defUMask); + if ($this->unlinkOnTruncate) { + $this->unlink($path); + } $result = file_put_contents($this->getSourcePath($path), $data); umask($oldMask); return $result; @@ -370,6 +378,9 @@ class Local extends \OC\Files\Storage\Common { return parent::copy($path1, $path2); } else { $oldMask = umask($this->defUMask); + if ($this->unlinkOnTruncate) { + $this->unlink($path2); + } $result = copy($this->getSourcePath($path1), $this->getSourcePath($path2)); umask($oldMask); return $result; @@ -378,6 +389,9 @@ class Local extends \OC\Files\Storage\Common { public function fopen($path, $mode) { $oldMask = umask($this->defUMask); + if (($mode === 'w' || $mode === 'w+') && $this->unlinkOnTruncate) { + $this->unlink($path); + } $result = fopen($this->getSourcePath($path), $mode); umask($oldMask); return $result; |