Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

sync: Respect maximum chunk size provided in server capabilities #7772

Merged
merged 12 commits into from
Jan 23, 2025
Merged

sync: Respect maximum chunk size provided in server capabilities #7772

merged 12 commits into from
Jan 23, 2025

Conversation

claucambra
Copy link
Collaborator

@claucambra claucambra commented Jan 20, 2025 •
edited
Loading

New feature being introduced in NC 31

Closes #7347

@claucambra claucambra added this to the 3.16.0 milestone Jan 20, 2025
@claucambra claucambra self-assigned this Jan 20, 2025
@claucambra claucambra changed the title Respect maximum chunk size provided in server capabilities folder: Respect maximum chunk size provided in server capabilities Jan 20, 2025
@claucambra claucambra changed the title folder: Respect maximum chunk size provided in server capabilities sync: Respect maximum chunk size provided in server capabilities Jan 20, 2025
nilsding
nilsding requested changes Jan 20, 2025
View reviewed changes
src/libsync/configfile.cpp Outdated Show resolved Hide resolved
src/gui/folder.cpp Outdated Show resolved Hide resolved
src/gui/folder.cpp Outdated Show resolved Hide resolved
@claucambra claucambra requested a review from nilsding January 20, 2025 09:28
mgallien
mgallien requested changes Jan 20, 2025
View reviewed changes
Copy link
Collaborator

@mgallien mgallien left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

see my comments

src/gui/folder.cpp Outdated Show resolved Hide resolved
src/gui/folder.cpp Outdated Show resolved Hide resolved
src/libsync/configfile.cpp Outdated Show resolved Hide resolved
@claucambra claucambra force-pushed the feature/capabilities-chunk-size-server branch from 3e63cbf to 15ac293 Compare January 20, 2025 10:09
@claucambra claucambra requested a review from mgallien January 20, 2025 13:43
@mgallien mgallien force-pushed the feature/capabilities-chunk-size-server branch from 15ac293 to f368fb1 Compare January 22, 2025 08:39
@mgallien mgallien enabled auto-merge January 22, 2025 08:39
@claucambra claucambra force-pushed the feature/capabilities-chunk-size-server branch from f368fb1 to 6576990 Compare January 22, 2025 14:14
@claucambra
Add maxChunkSize getter function to get chunked upload max size from …
35c7020 
…capabilities

This will be added with NC31

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Override config chunk sizing values with max chunk size retrieved fro…
d7c5435 
…m capabilities

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Enforce chunk size provided by server capabilities
a7d044f 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Add config entry to override server chunk size
9357080 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Fix naming for overrideSercerChunkSize constexpr
36b1f92 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Remove extraneous parenthesis
44a599e 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Fix capsMaxChunkSize comparison
a77f327 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Do not apply max capabilities chunk size as min chunk size too
b3ff083 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Actually call overrideServerChunkSize
0f02d70 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Remove overrideServerChunkSize config entry
bca2f1d 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Expose maxConcurrentChunkUploads from Capabilities
59f8546 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Apply max concurrent chunk uploads retrieved from server capabilities
46dc2a7 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra claucambra force-pushed the feature/capabilities-chunk-size-server branch from 6576990 to 46dc2a7 Compare January 23, 2025 02:13
@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-7772-46dc2a71f7691fc5e163759175e934e14376d496-x86_64.AppImage

To test this change/fix you can simply download above AppImage file and test it.

Please make sure to quit your existing Nextcloud app and backup your data.

@sonarqubecloud SonarQubeCloud
Copy link

Quality Gate Failed Quality Gate failed

Failed conditions
D Maintainability Rating on New Code (required ≥ A)
28 New Code Smells (required ≤ 0)

See analysis details on SonarQube Cloud

Catch issues before they fail your Quality Gate with our IDE extension SonarQube for IDE

@mgallien mgallien merged commit 9046f75 into master Jan 23, 2025
12 of 17 checks passed
@mgallien mgallien deleted the feature/capabilities-chunk-size-server branch January 23, 2025 02:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nilsding nilsding nilsding approved these changes

@mgallien mgallien mgallien approved these changes

@camilasan camilasan Awaiting requested review from camilasan

@Rello Rello Awaiting requested review from Rello

Assignees

@claucambra claucambra

Labels
None yet
Projects
None yet
Milestone
3.16.0
Development

Successfully merging this pull request may close these issues.

Rely on server chunked upload config if present
4 participants
@claucambra @nextcloud-desktop-bot @mgallien @nilsding