skip AAL tests if encryption is set

Author: ahmarsuhail

hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/contract/s3a/ITestS3AContractAnalyticsStreamVectoredRead.java

@@ -22,7 +22,11 @@
 import org.apache.hadoop.fs.contract.AbstractContractVectoredReadTest;
 import org.apache.hadoop.fs.contract.AbstractFSContract;
 
+import java.io.IOException;
+import java.io.UncheckedIOException;
+
 import static org.apache.hadoop.fs.s3a.S3ATestUtils.enableAnalyticsAccelerator;
+import static org.apache.hadoop.fs.s3a.S3ATestUtils.skipIfEncryptionSet;
 
 /**
  * S3A contract tests for vectored reads with the Analytics stream. The analytics stream does
@@ -44,6 +48,19 @@ public ITestS3AContractAnalyticsStreamVectoredRead(String bufferType) {
   protected Configuration createConfiguration() {
     Configuration conf = super.createConfiguration();
     enableAnalyticsAccelerator(conf);
+
+    // If encryption is set, some AAL tests will fail. This is because AAL caches the head request response, and uses
+    // the eTag when making a GET request. When using encryption, the eTag is no longer a hash of the object content,
+    // and is not always the same when the same object is created multiple times. This test creates the file
+    // vectored_file.txt before running each test, which will have a different eTag when using encryption, leading to
+    // preconditioned failures. This issue is tracked in:
+    // https://github.com/awslabs/analytics-accelerator-s3/issues/218
+    try {
+      skipIfEncryptionSet(conf);
+    } catch (IOException e) {
+      throw new UncheckedIOException(e);
+    }
+
     conf.set("fs.contract.vector-io-early-eof-check", "false");
     return conf;
   }

hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3AAnalyticsAcceleratorStreamReading.java

@@ -69,6 +69,7 @@ public class ITestS3AAnalyticsAcceleratorStreamReading extends AbstractS3ATestBa
   @Before
   public void setUp() throws Exception {
     super.setup();
+    skipIfClientSideEncryption();
     externalTestFile = getExternalData(getConfiguration());
   }
 

hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/S3ATestUtils.java

@@ -105,6 +105,7 @@
 
 import static org.apache.hadoop.fs.contract.ContractTestUtils.createFile;
 import static org.apache.hadoop.fs.impl.FlagSet.createFlagSet;
+import static org.apache.hadoop.fs.s3a.S3AEncryptionMethods.SSE_S3;
 import static org.apache.hadoop.fs.s3a.impl.streams.InputStreamType.Analytics;
 import static org.apache.hadoop.fs.s3a.impl.streams.InputStreamType.Prefetch;
 import static org.apache.hadoop.fs.s3a.impl.CallableSupplier.submit;
@@ -1709,6 +1710,24 @@ public static void skipIfEncryptionNotSet(Configuration configuration,
     }
   }
 
+  /**
+   * Skip a test if encryption algorithm is not empty, or if it is set to anything other than AES256.
+   *
+   * @param configuration configuration
+   * @throws IOException  if the secret lookup fails.
+   */
+  public static void skipIfEncryptionSet(Configuration configuration) throws IOException {
+    String bucket = getTestBucketName(configuration);
+    final EncryptionSecrets secrets = buildEncryptionSecrets(bucket, configuration);
+    S3AEncryptionMethods s3AEncryptionMethods = secrets.getEncryptionMethod();
+
+    if (s3AEncryptionMethods.getMethod().equals(SSE_S3.getMethod()) || s3AEncryptionMethods.getMethod().isEmpty()) {
+      return;
+    }
+
+    skip("Encryption method is set to " + s3AEncryptionMethods.getMethod());
+  }
+
   /**
    * Get the input stream statistics of an input stream.
    * Raises an exception if the inner stream is not an S3A input stream