fix(dav): Limit number of UPDATES for sync token created_at #45968
+28
−1
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
ChristophWurst
added
bug
3. to review
ChristophWurst
requested review from
icewind1991,
st3iny,
tcitworld,
miaulalala and
SebastianKrupinski
|
/backport to stable29 |
|
/backport to stable28 |
|
/backport to stable27 |
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| // The threshold is higher than the default of \OCA\DAV\BackgroundJob\PruneOutdatedSyncTokensJob | ||
| // but small enough to fit into a cluster transaction size. | ||
| // For a 50k users instance that would still keep 10 changes on average. | ||
| $limit = max(1, (int) $this->appConfig->getAppValue('totalNumberOfSyncTokensToKeep', '500000')); |
Check notice
Code scanning / Psalm
DeprecatedMethod Note
| ->setFirstResult($limit) | ||
| ->setMaxResults(1); | ||
| $oldestIdResult = $thresholdSelect->executeQuery(); | ||
| $oldestId = $oldestIdResult->fetchColumn(); |
Check notice
Code scanning / Psalm
DeprecatedMethod Note
icewind1991
approved these changes
Jun 19, 2024
miaulalala
approved these changes
Jun 19, 2024
ChristophWurst
force-pushed
the
fix/dav/limit-sync-token-created-at-updates
branch
from
19379b2
to
c051834
Compare
Address book and calendar sync tokens have a created_at column in 26+ and we need to assign a current timestamp to the existing data at upgrade so the data isn't cleaned up immediately. Updating the full table is expensive and fails on clustered setups that limit transaction size. We don't need a timestamp for the oldest rows so we can skip updating them. Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
ChristophWurst
force-pushed
the
fix/dav/limit-sync-token-created-at-updates
branch
from
c051834
to
169eeda
Compare
SebastianKrupinski
approved these changes
Jun 19, 2024
|
/backport to stable26 |
|
The backport to # Switch to the target branch and update it
git checkout stable26
git pull origin stable26
# Create the new backport branch
git checkout -b backport/45968/stable26
# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick 169eedab
# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/45968/stable26Error: No changes found in backport branch Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports. |
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.
Summary
Address book and calendar sync tokens have a created_at column in 26+ and we need to assign a current timestamp to the existing data at upgrade so the data isn't cleaned up immediately. Updating the full table is expensive and fails on clustered setups that limit transaction size. We don't need a timestamp for the oldest rows so we can skip updating them.
TODO
Checklist