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

Add retry logic to cover deadlock situations during move operations #44504

Merged
merged 1 commit into from
Mar 28, 2024
Merged

Add retry logic to cover deadlock situations during move operations #44504

merged 1 commit into from
Mar 28, 2024

Conversation

artonge
Copy link
Contributor

@artonge artonge commented Mar 27, 2024 •
edited
Loading

Should help with #43759

@artonge artonge force-pushed the artonge/feat/retry_cache_operations_on_deadlock branch 2 times, most recently from a70f870 to 02476db Compare March 27, 2024 12:55
@artonge artonge self-assigned this Mar 27, 2024
@artonge artonge added 2. developing Work in progress feature: files php Pull requests that update Php code enhancement labels Mar 27, 2024
@artonge artonge added this to the Nextcloud 29 milestone Mar 27, 2024
@artonge artonge force-pushed the artonge/feat/retry_cache_operations_on_deadlock branch 2 times, most recently from aa36481 to 81cc3a5 Compare March 27, 2024 13:13
@artonge artonge marked this pull request as ready for review March 27, 2024 13:13
@artonge artonge force-pushed the artonge/feat/retry_cache_operations_on_deadlock branch 2 times, most recently from 6b3665c to f9cc3f7 Compare March 27, 2024 13:14
@artonge artonge changed the title Add retry logic to cover deadlock situations Add retry logic to cover deadlock situations during move operations Mar 27, 2024
@artonge artonge force-pushed the artonge/feat/retry_cache_operations_on_deadlock branch 2 times, most recently from 6b63644 to f16632a Compare March 27, 2024 13:26
@artonge artonge added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Mar 27, 2024
@artonge artonge force-pushed the artonge/feat/retry_cache_operations_on_deadlock branch from f16632a to d945191 Compare March 27, 2024 13:52
@artonge artonge force-pushed the artonge/feat/retry_cache_operations_on_deadlock branch 3 times, most recently from 7d33b1c to eded22f Compare March 27, 2024 16:00
@artonge
Copy link
Contributor Author

artonge commented Mar 27, 2024

/backport to stable28

@artonge
Copy link
Contributor Author

artonge commented Mar 27, 2024

/backport to stable27

@artonge
Copy link
Contributor Author

artonge commented Mar 27, 2024

/backport to stable26

@artonge artonge requested review from Altahrim and icewind1991 March 27, 2024 16:30
@artonge artonge force-pushed the artonge/feat/retry_cache_operations_on_deadlock branch from eded22f to 3238a3a Compare March 27, 2024 18:35
come-nc
come-nc reviewed Mar 28, 2024
View reviewed changes
Copy link
Contributor

@come-nc come-nc left a comment

Choose a reason for hiding this comment

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

I think I like it, especially if it works? Did not test yet.

Is there anyway to let the DB or our Query layer handle that? Have some kind of generic way of saying «run this query in a transaction, if it deadlocks retry up to X times» ?

lib/private/Files/Cache/Cache.php Outdated Show resolved Hide resolved
@mgallien mgallien mentioned this pull request Mar 28, 2024
Closed
@artonge artonge force-pushed the artonge/feat/retry_cache_operations_on_deadlock branch from 3238a3a to d297f81 Compare March 28, 2024 08:03
@artonge
feat(files)): Add retry logic to cover deadlock situations when movin…
7517959 
…g many files

Signed-off-by: Louis Chemineau <louis@chmn.me>
@artonge artonge force-pushed the artonge/feat/retry_cache_operations_on_deadlock branch from d297f81 to 7517959 Compare March 28, 2024 08:05
@artonge artonge mentioned this pull request Mar 28, 2024
Closed
3 tasks
@artonge artonge merged commit 28c8a46 into master Mar 28, 2024
168 checks passed
@artonge artonge deleted the artonge/feat/retry_cache_operations_on_deadlock branch March 28, 2024 09:38
@backportbot backportbot bot mentioned this pull request Mar 28, 2024
Merged
@artonge
Copy link
Contributor Author

artonge commented Mar 28, 2024

/backport to stable27

@artonge
Copy link
Contributor Author

artonge commented Mar 28, 2024

/backport to stable28

@backportbot backportbot bot mentioned this pull request Mar 28, 2024
Merged
@backportbot backportbot bot mentioned this pull request Mar 28, 2024
Merged
@skjnldsv skjnldsv mentioned this pull request Mar 28, 2024
Merged
81 tasks
@artonge artonge mentioned this pull request Apr 8, 2024
Closed
mgallien added a commit that referenced this pull request Jun 10, 2024
@mgallien
fix restore of multiple folders with many files from trash_bin
6c37b16 
related to #44504

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
@mgallien mgallien mentioned this pull request Jun 10, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@icewind1991 icewind1991 icewind1991 left review comments

@solracsf solracsf solracsf left review comments

@come-nc come-nc come-nc left review comments

@Altahrim Altahrim Altahrim approved these changes

@juliusknorr juliusknorr juliusknorr approved these changes

@nickvergessen nickvergessen Awaiting requested review from nickvergessen

@blizzz blizzz Awaiting requested review from blizzz

Assignees

@artonge artonge

Labels
3. to review Waiting for reviews enhancement feature: files php Pull requests that update Php code
Projects
None yet
Milestone
Nextcloud 29
Development

Successfully merging this pull request may close these issues.
6 participants
@artonge @icewind1991 @Altahrim @juliusknorr @solracsf @come-nc