amogh-jahagirdar commented on code in PR #10433: URL: https://github.com/apache/iceberg/pull/10433#discussion_r1725989680
########## aws/src/test/java/org/apache/iceberg/aws/s3/TestFuzzyS3InputStream.java: ########## @@ -0,0 +1,224 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.iceberg.aws.s3; + +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.spy; + +import java.io.IOException; +import java.io.InputStream; +import java.net.SocketTimeoutException; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.stream.Stream; +import javax.net.ssl.SSLException; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; +import software.amazon.awssdk.awscore.exception.AwsServiceException; +import software.amazon.awssdk.core.ResponseInputStream; +import software.amazon.awssdk.core.exception.SdkClientException; +import software.amazon.awssdk.core.sync.RequestBody; +import software.amazon.awssdk.core.sync.ResponseTransformer; +import software.amazon.awssdk.services.s3.S3Client; +import software.amazon.awssdk.services.s3.model.CreateBucketRequest; +import software.amazon.awssdk.services.s3.model.CreateBucketResponse; +import software.amazon.awssdk.services.s3.model.GetObjectRequest; +import software.amazon.awssdk.services.s3.model.GetObjectResponse; +import software.amazon.awssdk.services.s3.model.HeadObjectRequest; +import software.amazon.awssdk.services.s3.model.HeadObjectResponse; +import software.amazon.awssdk.services.s3.model.PutObjectRequest; +import software.amazon.awssdk.services.s3.model.PutObjectResponse; + +public class TestFuzzyS3InputStream extends TestS3InputStream { + + private static final int DATA_SIZE = 100; + private static final int SEEK_SIZE = 4; + private static final int SEEK_NEW_POSITION = 25; + + @ParameterizedTest + @MethodSource("retryableExceptions") + public void testReadWithFuzzyStreamRetrySucceed(IOException exception) throws Exception { + testRead(fuzzyStreamClient(new AtomicInteger(3), exception), DATA_SIZE); + } + + @ParameterizedTest + @MethodSource("retryableExceptions") + public void testReadWithFuzzyStreamExhaustedRetries(IOException exception) { + assertThatThrownBy( + () -> testRead(fuzzyStreamClient(new AtomicInteger(5), exception), DATA_SIZE)) + .isInstanceOf(exception.getClass()) + .hasMessage(exception.getMessage()); + } + + @ParameterizedTest + @MethodSource("nonRetryableExceptions") + public void testReadWithFuzzyStreamNonRetryableException(IOException exception) { + assertThatThrownBy( + () -> testRead(fuzzyStreamClient(new AtomicInteger(3), exception), DATA_SIZE)) + .isInstanceOf(exception.getClass()) + .hasMessage(exception.getMessage()); + } + + @Override + protected void testRead(S3Client s3, int dataSize) throws Exception { + testRead(s3, DATA_SIZE, 4, SEEK_SIZE, SEEK_NEW_POSITION); + } + + private static Stream<Arguments> retryableExceptions() { + return Stream.of( + Arguments.of( + new SocketTimeoutException("socket timeout exception"), + new SSLException("some ssl exception"))); + } + + private static Stream<Arguments> nonRetryableExceptions() { + return Stream.of(Arguments.of(new IOException("some generic non-retryable IO exception"))); + } + + private S3ClientWrapper fuzzyStreamClient(AtomicInteger counter, IOException failure) { + S3ClientWrapper fuzzyClient = spy(new S3ClientWrapper(s3Client())); + doAnswer( + invocation -> + new FuzzyResponseInputStream(invocation.callRealMethod(), counter, failure)) + .when(fuzzyClient) + .getObject(any(GetObjectRequest.class), any(ResponseTransformer.class)); + return fuzzyClient; + } + + /** Wrapper for S3 client, used to mock the final class DefaultS3Client */ + public static class S3ClientWrapper implements S3Client { + + private final S3Client delegate; + + public S3ClientWrapper(S3Client delegate) { + this.delegate = delegate; + } + + @Override + public String serviceName() { + return delegate.serviceName(); + } + + @Override + public void close() { + delegate.close(); + } + + @Override + public <ReturnT> ReturnT getObject( + GetObjectRequest getObjectRequest, + ResponseTransformer<GetObjectResponse, ReturnT> responseTransformer) + throws AwsServiceException, SdkClientException { + return delegate.getObject(getObjectRequest, responseTransformer); Review Comment: I was going to track the start ranges that were requested on each getObject and assert that the positions being retried are as expected but this ends up really complicating the tests for what I think is not too much additional value because actually the `testRead` we are inheriting verifies the contents actually being read in each `readAndCheck`. If there's a retry that's being performed to an incorrect position, this would mean that the contents would be incorrect and tests would fail and we know that the retry path is being exercised given the presence of the fuzzy stream client. cc @nastra @danielcweeks -- 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: issues-unsubscr...@iceberg.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: issues-unsubscr...@iceberg.apache.org For additional commands, e-mail: issues-h...@iceberg.apache.org
