[stable26] fix: write object to the correct urn when moving from another storage to object store #47488
+254
−0
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![backportbot[bot]](https://avatars.githubusercontent.com/in/60201?s=60&v=4){kind=small}
artonge
approved these changes
Aug 26, 2024
4 tasks
danxuliu
previously requested changes
Oct 31, 2024
There was a problem hiding this comment.
This change introduced a regression as described in #47986 (comment)
|
Cherry-picked commits from https://github.com/nextcloud/server/pull/48998/commits |
artonge
approved these changes
Oct 31, 2024
artonge
force-pushed
the
backport/46013/stable26
branch
from
6fee632
to
344d058
Compare
danxuliu
dismissed
their stale review
Regression fixed in cherry-picked commits
… to object store Signed-off-by: Robin Appelman <robin@icewind.nl>
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 #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>
Some are still failing Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
Signed-off-by: Robin Appelman <robin@icewind.nl>
|
@icewind1991 should we include 3e12e1e here too? |
artonge
force-pushed
the
backport/46013/stable26
branch
from
344d058
to
4c95ba9
Compare
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| $this->copyObjects($sourceStorage, $sourceCache, $sourceCacheEntry); | ||
| if ($sourceStorage->instanceOfStorage(ObjectStoreStorage::class)) { | ||
| /** @var ObjectStoreStorage $sourceStorage */ | ||
| $sourceStorage->setPreserveCacheOnDelete(true); |
Check failure
Code scanning / Psalm
UndefinedMethod Error
| } | ||
| if ($sourceStorage->instanceOfStorage(ObjectStoreStorage::class)) { | ||
| /** @var ObjectStoreStorage $sourceStorage */ | ||
| $sourceStorage->setPreserveCacheOnDelete(false); |
Check failure
Code scanning / Psalm
UndefinedMethod Error
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backport of PR #46013