diff options
| author | Christoph Fiehe <c.fiehe@eurodata.de> | 2024-09-14 23:05:12 +0200 |
|---|---|---|
| committer | cfiehe <cfiehe@users.noreply.github.com> | 2024-09-16 15:11:09 +0200 |
| commit | 9597072ada7c0b9b7ee0d6e790a8422eab73572a (patch) | |
| tree | cfff68776a5ebb726d9bfc2beddbb50f9b6535a7 /lib | |
| parent | cfed24cb0254caf570b2a520979a83435a677cc8 (diff) | |
| download | nextcloud-server-9597072ada7c0b9b7ee0d6e790a8422eab73572a.tar.gz nextcloud-server-9597072ada7c0b9b7ee0d6e790a8422eab73572a.zip | |
perf(ObjectStoreStorage): Improve (slow) move on same object bucket
This commit fixes the issue #47856. When you upload a file into a group folder and when you use a single S3 bucket as primary storage, the final move operation hangs for a long time. In the background, Nextcloud initiates a copy-delete sequence from the bucket into the bucket, with causes a lot unnecessary overhead. Nextcloud thinks that the file must be imported to another storage and does not recognize that everything is done on the same object bucket. In that case, the import step can be completely skipped, which saves time, network bandwidth and reduces the load on the object storage.
The behavior improves a lot with https://github.com/nextcloud/server/pull/46013. However, there are still some put messages that are being sent to the object storage when you use an object storage as primary storage and upload files into a group folder.
Co-authored-by: Kate <26026535+provokateurin@users.noreply.github.com>
Signed-off-by: Christoph Fiehe <c.fiehe@eurodata.de>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/Files/ObjectStore/ObjectStoreStorage.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/private/Files/ObjectStore/ObjectStoreStorage.php b/lib/private/Files/ObjectStore/ObjectStoreStorage.php index 228fc516677..18a75e61b1c 100644 --- a/lib/private/Files/ObjectStore/ObjectStoreStorage.php +++ b/lib/private/Files/ObjectStore/ObjectStoreStorage.php @@ -596,6 +596,11 @@ class ObjectStoreStorage extends \OC\Files\Storage\Common implements IChunkedFil public function moveFromStorage(IStorage $sourceStorage, $sourceInternalPath, $targetInternalPath, ?ICacheEntry $sourceCacheEntry = null): bool { $sourceCache = $sourceStorage->getCache(); + if ($sourceStorage->instanceOfStorage(ObjectStoreStorage::class) && $sourceStorage->getObjectStore()->getStorageId() === $this->getObjectStore()->getStorageId()) { + $this->getCache()->moveFromCache($sourceCache, $sourceInternalPath, $targetInternalPath); + // Do not import any data when source and target bucket are identical. + return true; + } if (!$sourceCacheEntry) { $sourceCacheEntry = $sourceCache->get($sourceInternalPath); } |