SDK-365 Fix infinite retry loop in ResolverCommand when error is not a file conflict#350
Merged
saimonation merged 1 commit intomasterfrom May 6, 2026
Merged
Conversation
…a file conflict ResolverCommand.execute() and a_execute() previously retried with the resolver for ANY CopyError/MoveError/RenameError. This caused an infinite loop when the portal returned PermissionDenied (or any non-conflict error) because the retry would immediately fail again with the same error. Now only retries when e.__cause__ is FileConflictError, which is the only case where a resolver can meaningfully resolve the issue. Co-authored-by: Cursor <cursoragent@cursor.com>
saimonation
approved these changes
May 6, 2026
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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
ResolverCommand.execute()anda_execute()when the error is not a file conflictCopyError/MoveError/RenameErrorwith a resolver present would trigger a retry, causing an infinite loop for PermissionDenied and other non-conflict errorse.__cause__isFileConflictErrorRoot Cause
When a ReadOnlyAdmin copies/moves between users cloud folders with a conflict resolver:
a_execute()catches CopyError, sees resolver is set, retriesTest plan
Fixes: https://cteranet.atlassian.net/browse/SDK-365
Related: https://cteranet.atlassian.net/browse/PIM-7443