fix: Check for wrapped retriable exceptions to handle deadlocks#37709
fix: Check for wrapped retriable exceptions to handle deadlocks#37709juliusknorr merged 1 commit intomasterfrom
Conversation
dd7ce57 to
4bdde31
Compare
|
@juliushaertl what is missing here? |
Signed-off-by: Julius Härtl <jus@bitgrid.net>
4bdde31 to
3bdd770
Compare
|
Split out the new API change and this is now ready for review for just the bugfix |
|
Failure unrelated |
|
/backport to stable26 |
|
/backport to stable25 |
|
/backport to stable24 |
|
The backport to stable26 failed. Please do this backport manually. # Switch to the target branch and update it
git checkout stable26
git pull origin/stable26
# Create the new backport branch
git checkout -b fix/foo-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 abc123
# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable26More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport |
|
The backport to stable25 failed. Please do this backport manually. # Switch to the target branch and update it
git checkout stable25
git pull origin/stable25
# Create the new backport branch
git checkout -b fix/foo-stable25
# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123
# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable25More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport |
|
The backport to stable24 failed. Please do this backport manually. # Switch to the target branch and update it
git checkout stable24
git pull origin/stable24
# Create the new backport branch
git checkout -b fix/foo-stable24
# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123
# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable24More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport |
|
/backport to stable26 |
|
/backport to stable25 |
|
/backport to stable24 |
Follow-up fix for #34302 which was trying to catch an exception that was wrapped by our own exception class so the catch would never have catched.
Exact code part https://github.com/nextcloud/server/pull/34302/files#diff-9cdfa82a2275acf10161656ddc7b70be83cdbf6be8663ecfb8f963e4eb516d8eR139