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.

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

fix: Check for wrapped retriable exceptions to handle deadlocks #37709

Merged
merged 1 commit into from
May 13, 2023

Conversation

juliusknorr
Copy link
Member

@juliusknorr juliusknorr commented Apr 13, 2023

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

@szaimen szaimen added the 2. developing Work in progress label Apr 13, 2023
@szaimen szaimen added this to the Nextcloud 27 milestone Apr 13, 2023
@szaimen
Copy link
Contributor

szaimen commented Apr 26, 2023

@juliushaertl what is missing here?

@juliusknorr juliusknorr added bug 3. to review Waiting for reviews and removed 2. developing Work in progress labels May 2, 2023
@juliusknorr juliusknorr marked this pull request as ready for review May 2, 2023 17:45
@juliusknorr
Copy link
Member Author

Split out the new API change and this is now ready for review for just the bugfix

@szaimen szaimen removed their request for review May 2, 2023 17:46
This was referenced May 3, 2023
@juliusknorr juliusknorr requested a review from come-nc May 9, 2023 17:22
@juliusknorr
Copy link
Member Author

Failure unrelated

@juliusknorr juliusknorr merged commit e18f97f into master May 13, 2023
@juliusknorr juliusknorr deleted the bugfix/deadlock branch May 13, 2023 11:13
@juliusknorr
Copy link
Member Author

/backport to stable26

@juliusknorr
Copy link
Member Author

/backport to stable25

@juliusknorr
Copy link
Member Author

/backport to stable24

@backportbot-nextcloud
Copy link

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-stable26

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

@backportbot-nextcloud
Copy link

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-stable25

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

@backportbot-nextcloud
Copy link

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-stable24

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

@solracsf
Copy link
Member

/backport to stable26

@solracsf
Copy link
Member

/backport to stable25

@blizzz blizzz mentioned this pull request May 17, 2023
@juliusknorr juliusknorr changed the title fix: Check for wrapped retriable exceptions fix: Check for wrapped retriable exceptions to handle deadlocks Jun 12, 2023
@kesselb
Copy link
Contributor

kesselb commented Jun 21, 2023

/backport to stable24

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3. to review Waiting for reviews bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants