akpatnam25 commented on code in PR #39611:
URL: https://github.com/apache/spark/pull/39611#discussion_r1071587701
##########
common/network-shuffle/src/test/java/org/apache/spark/network/shuffle/RetryingBlockTransferorSuite.java:
##########
@@ -341,6 +343,35 @@ public void testBlockTransferFailureAfterSasl() throws
IOException, InterruptedE
assert(_retryingBlockTransferor.getRetryCount() == 1);
}
+ @Test
+ public void testIOExceptionFailsConnectionEvenWithSaslException()
Review Comment:
do you think we should also expose `saslRetryCount` as `@VisibleForTesting`
and assert the count in the tests?
##########
common/network-shuffle/src/test/java/org/apache/spark/network/shuffle/RetryingBlockTransferorSuite.java:
##########
@@ -341,6 +343,35 @@ public void testBlockTransferFailureAfterSasl() throws
IOException, InterruptedE
assert(_retryingBlockTransferor.getRetryCount() == 1);
}
+ @Test
+ public void testIOExceptionFailsConnectionEvenWithSaslException()
+ throws IOException, InterruptedException {
+ BlockFetchingListener listener = mock(BlockFetchingListener.class);
+
+ SaslTimeoutException saslExceptionInitial = new
SaslTimeoutException("initial",
+ new TimeoutException());
+ SaslTimeoutException saslExceptionFinal = new SaslTimeoutException("final",
+ new TimeoutException());
+ IOException ioException = new IOException();
+ List<? extends Map<String, Object>> interactions = Arrays.asList(
+ ImmutableMap.of("b0", saslExceptionInitial),
+ ImmutableMap.of("b0", ioException),
+ ImmutableMap.of("b0", saslExceptionInitial),
+ ImmutableMap.of("b0", ioException),
+ ImmutableMap.of("b0", saslExceptionFinal),
+ // will not get invoked
Review Comment:
Can you add to this comment to explain why it won't get invoked?
##########
common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/RetryingBlockTransferor.java:
##########
@@ -203,16 +215,15 @@ private synchronized boolean shouldRetry(Throwable e) {
boolean isIOException = e instanceof IOException
|| e.getCause() instanceof IOException;
boolean isSaslTimeout = enableSaslRetries && e instanceof
SaslTimeoutException;
- if (!isSaslTimeout && saslTimeoutSeen) {
- retryCount = 0;
- saslTimeoutSeen = false;
+ // If this is a non SASL request failure, reduce earlier SASL failures
from retryCount
+ // since some subsequent SASL attempt was successful
+ if (!isSaslTimeout && saslRetryCount > 0) {
+ retryCount -= saslRetryCount;
Review Comment:
Should we also verify that `retryCount >= saslRetryCount`? Just so that we
don't ever end up in some funky state where we end up with negative values (I
don't think this can ever happen, but would good to add the check!). :)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
