HDDS-14212 Make maxFailovers in S3g apply on a per-request basis. #9546
+358
−14
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.
What changes were proposed in this pull request?
This PR makes
maxFailoversandfailoverCountin S3g apply on a per-request basis.Rationale:
hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/protocolPB/GrpcOmTransport.javaline 93: we haveprivate int failoverCount = 0;- All threads share this counter; it never resets.GrpcOmTransport.shouldRetry(258) we runaction = retryPolicy.shouldRetry((Exception)ex, 0, failoverCount++, true);which is also shared between requests.OMFailoverProxyProviderBase.getRetryPolicy.getRetryAction, we still use that globalfailoverCountcheckingif (failovers < maxFailovers)(258), which always returnsreturn RetryAction.FAIL;(263) once we reached themaxFailoversmaxFailoversfrom above is defined byOZONE_CLIENT_FAILOVER_MAX_ATTEMPTS_KEYI propose to change the value of
failoverCountper request, rather than making it a global flag. So basically, it makesOZONE_CLIENT_FAILOVER_MAX_ATTEMPTS_KEYconfiguration to serve on a per-request basis.Detailed explanation and discussion are here: #9477
What is the link to the Apache JIRA
https://issues.apache.org/jira/browse/HDDS-14212
How was this patch tested?
Branch pipeline: https://github.com/greenwich/ozone/actions/runs/20430980506
failoverCountis set for each requestom0toom2. It reproduces the issue, then I used it to test the fix.Concurrent test results before the fix - demonstrating the bug -> failover didn't happen to om2
Concurrent test results after the fix - demonstrating the correct behaviour -> failover to om2