Repository navigation
HDDS-17320. SCM client does not recognize RetriableWithNoFailoverException returned by SCM - #11698
Merged
Merged
Conversation
…ption returned by SCM Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
adoroszlai
reviewed
Oct 23, 2026
… can be unwrapped Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
chihsuan
approved these changes
Oct 24, 2026
chihsuan
left a comment
chihsuan
left a comment
Member
There was a problem hiding this comment.
Thanks for the patch, @smengcl! LGTM.
This should also fix the intermittent ozone-ha k8s CI failure (HDDS-16638). I reproduced it locally, and this patch fixes it.
adoroszlai
marked this pull request as ready for review
October 24, 2026 04:16
Contributor
Contributor
Author
|
Thanks @adoroszlai @chihsuan for the reviews. |
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
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.
Generated-by: Claude Code (Opus 5.5)
What changes were proposed in this pull request?
SCM converts errors that should be retried on the same SCM (Ratis
LeaderNotReadyException,ReconfigurationInProgressException,ReconfigurationTimeoutException,ResourceUnavailableException, and some certificate failures) toRetriableWithNoFailoverException. The SCM client checks for it inSCMHAUtils.checkRetriableWithNoFailoverException, using the exception unwrapped fromRemoteException. ButRetriableWithNoFailoverExceptionhas noStringconstructor, soRemoteException.unwrapRemoteException()cannot create it and returns theRemoteExceptionitself. The check never matches, and the client fails over to another SCM instead of retrying the same one.This change adds the
Stringconstructor (as HDDS-10760 did for other exceptions), so the exception is unwrapped and the client retries the same SCM (up to the configured retry count) as intended.What is the link to the Apache JIRA
https://issues.apache.org/jira/browse/HDDS-17320
How was this patch tested?
Added
TestSCMHAUtils#retriesSameScmOnRetriableWithNoFailoverException, which fails without the fix. ExistingTestSCMFailoverProxyProvider*tests pass.🤖 Generated with Claude Code