Add some tests

Signed-off-by: Peter Nied <petern@amazon.com>
peternied · Oct 6, 2023 · 1d6d96d · 1d6d96d
1 parent e7df5d2
commit 1d6d96d
Show file tree

Hide file tree

Showing 3 changed files with 121 additions and 41 deletions.
diff --git a/.github/workflows/resources-workflows.yml b/.github/workflows/resources-workflows.yml
@@ -0,0 +1,36 @@
+name: Resource-Tests
+
+on:
+  push:
+  pull_request:
+
+env:
+  GRADLE_OPTS: -Dhttp.keepAlive=false
+
+jobs:
+  integration-tests:
+    name: integration-tests
+    strategy:
+      fail-fast: false
+      matrix:
+        jdk: [17]
+        platform: [ubuntu-latest]
+    runs-on: ${{ matrix.platform }}
+
+    steps:
+    - name: Set up JDK for build and test
+      uses: actions/setup-java@v3
+      with:
+        distribution: temurin # Temurin is a distribution of adoptium
+        java-version: ${{ matrix.jdk }}
+
+    - name: Checkout security
+      uses: actions/checkout@v4
+
+    - name: Build and Test
+      uses: gradle/gradle-build-action@v2
+      continue-on-error: true # Until retries are enable do not fail the workflow https://github.com/opensearch-project/security/issues/2184
+      with:
+        cache-disabled: true
+        arguments: |
+            integrationTest -Dbuild.snapshot=false
diff --git a/src/integrationTest/java/org/opensearch/security/ResourceFocusedTests.java b/src/integrationTest/java/org/opensearch/security/ResourceFocusedTests.java
@@ -1,29 +1,7 @@
 package org.opensearch.security;
 
-import org.apache.hc.client5.http.classic.methods.HttpPost;
-import org.apache.hc.client5.http.config.RequestConfig;
-import org.apache.hc.core5.http.ContentType;
-import org.apache.hc.core5.http.Header;
-import org.apache.hc.core5.http.io.entity.ByteArrayEntity;
-import org.apache.hc.core5.http.message.BasicHeader;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.opensearch.action.admin.indices.alias.IndicesAliasesRequest;
-import org.opensearch.action.index.IndexRequest;
-import org.opensearch.client.Client;
-import org.opensearch.test.framework.TestSecurityConfig;
-import org.opensearch.test.framework.TestSecurityConfig.User;
-import org.opensearch.test.framework.cluster.ClusterManager;
-import org.opensearch.test.framework.cluster.LocalCluster;
-import org.opensearch.test.framework.cluster.TestRestClient;
-import org.opensearch.test.framework.cluster.TestRestClient.HttpResponse;
-
-import com.carrotsearch.randomizedtesting.annotations.ThreadLeakScope;
-
-import java.util.zip.GZIPOutputStream;
-
+import static org.opensearch.action.support.WriteRequest.RefreshPolicy.IMMEDIATE;
+import static org.opensearch.test.framework.TestSecurityConfig.AuthcDomain.AUTHC_HTTPBASIC_INTERNAL;
 import static org.opensearch.test.framework.TestSecurityConfig.Role.ALL_ACCESS;
 
 import java.io.ByteArrayOutputStream;
@@ -37,12 +15,30 @@
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ForkJoinPool;
+import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
+import java.util.zip.GZIPOutputStream;
 
-import static org.opensearch.test.framework.TestSecurityConfig.AuthcDomain.AUTHC_HTTPBASIC_INTERNAL;
-import static org.opensearch.action.support.WriteRequest.RefreshPolicy.IMMEDIATE;
+import org.apache.hc.client5.http.classic.methods.HttpPost;
+import org.apache.hc.core5.http.ContentType;
+import org.apache.hc.core5.http.io.entity.ByteArrayEntity;
+import org.apache.hc.core5.http.message.BasicHeader;
+import org.apache.http.HttpHeaders;
+import org.junit.BeforeClass;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.opensearch.action.index.IndexRequest;
+import org.opensearch.client.Client;
+import org.opensearch.test.framework.TestSecurityConfig;
+import org.opensearch.test.framework.TestSecurityConfig.User;
+import org.opensearch.test.framework.cluster.ClusterManager;
+import org.opensearch.test.framework.cluster.LocalCluster;
+import org.opensearch.test.framework.cluster.TestRestClient;
+
+import com.carrotsearch.randomizedtesting.annotations.ThreadLeakScope;
 
 @RunWith(com.carrotsearch.randomizedtesting.RandomizedRunner.class)
 @ThreadLeakScope(ThreadLeakScope.Scope.NONE)
@@ -82,22 +78,57 @@ public static void createTestData() {
     }
 
     @Test
-    public void testUnauthenticated() {
-        final byte[] compressedRequestBody = createCompressedRequestBody();
+    public void testUnauthenticatedFewBig() {
+        // Tweaks:
+        final RequestBodySize size = RequestBodySize.XLarge;
+        final String requestPath = "/*/_search";
+        final int parrallelism = 5;
+        final int totalNumberOfRequests = 100;
+        final boolean statsPrinter = false;
+
+        runResourceTest(size, requestPath, parrallelism, totalNumberOfRequests, statsPrinter);
+    }
+
+    @Test
+    public void testUnauthenticatedManyMedium() {
+        // Tweaks:
+        final RequestBodySize size = RequestBodySize.Medium;
+        final String requestPath = "/*/_search";
+        final int parrallelism = 20;
+        final int totalNumberOfRequests = 10_000;
+        final boolean statsPrinter = false;
+
+        runResourceTest(size, requestPath, parrallelism, totalNumberOfRequests, statsPrinter);
+    }
+
+    @Test
+    public void testUnauthenticatedTonsSmall() {
+        // Tweaks:
+        final RequestBodySize size = RequestBodySize.Small;
+        final String requestPath = "/*/_search";
+        final int parrallelism = 100;
+        final int totalNumberOfRequests = 1_000_000;
+        final boolean statsPrinter = false;
+
+        runResourceTest(size, requestPath, parrallelism, totalNumberOfRequests, statsPrinter);
+    }
+
+    private Long runResourceTest(final RequestBodySize size, final String requestPath, final int parrallelism, final int totalNumberOfRequests, final boolean statsPrinter) {
+        final byte[] compressedRequestBody = createCompressedRequestBody(size);
         try (final TestRestClient client = cluster.getRestClient(new BasicHeader("Content-Encoding", "gzip"))) {
 
-            printStats();
-            final HttpPost post = new HttpPost(client.getHttpServerUri() + "/*/_search");
+            if (statsPrinter) { printStats(); }
+            final HttpPost post = new HttpPost(client.getHttpServerUri() + requestPath);
             post.setEntity(new ByteArrayEntity(compressedRequestBody, ContentType.APPLICATION_JSON));
 
-            final ForkJoinPool forkJoinPool = new ForkJoinPool(5);
+            final ForkJoinPool forkJoinPool = new ForkJoinPool(parrallelism);
 
-            final List<CompletableFuture<Void>> waitingOn = IntStream.rangeClosed(0, 100).boxed().map( i ->
+            final List<CompletableFuture<Void>> waitingOn = IntStream.rangeClosed(1, totalNumberOfRequests).boxed().map( i ->
                 CompletableFuture.runAsync(() -> client.executeRequest(post), forkJoinPool)
             ).collect(Collectors.toList());
             Supplier<Long> getCount = () -> waitingOn.stream().filter(cf -> cf.isDone() && !cf.isCompletedExceptionally()).count();
 
-            CompletableFuture<Void> statPrinter = CompletableFuture.runAsync(() -> {
+            CompletableFuture<Void> statPrinter = statsPrinter ? CompletableFuture.runAsync(() -> {
                 while (true) {
                     printStats();
                     System.out.println(" & Succesful completions: " + getCount.get());
@@ -107,25 +138,38 @@ public void testUnauthenticated() {
                         break;
                     }
                 }
-            }, forkJoinPool);
+            }, forkJoinPool) : CompletableFuture.completedFuture(null);
 
 
             final CompletableFuture<Void> allOfThem = CompletableFuture.allOf(waitingOn.toArray(new CompletableFuture[0]));
 
             try {
-                allOfThem.join();
+                allOfThem.get(30, TimeUnit.SECONDS);
                 statPrinter.cancel(true);
             } catch (final Exception e) {
                 // Ignored
             }
 
-            printStats();
-            System.out.println(" & Succesful completions: " + getCount.get());
+            if (statsPrinter) {
+                printStats();
+                System.out.println(" & Succesful completions: " + getCount.get());
+            }
+            return getCount.get();
+        }
+    }
+
+    static enum RequestBodySize {
+        Small(1),
+        Medium(1_000),
+        XLarge(1_000_000);
+        public final int elementCount;
+        private RequestBodySize(final int elementCount) {
+            this.elementCount = elementCount;
         }
     }
 
-    private byte[] createCompressedRequestBody() {
-        final int repeatCount = 5000000;
+    private byte[] createCompressedRequestBody(final RequestBodySize size) {
+        final int repeatCount = size.elementCount;
         final String prefix = "{ \"items\": [";
         final String repeatedElement = IntStream.range(0, 20)
             .mapToObj(n -> ('a' + n)+"")

diff --git a/...main/java/org/opensearch/security/ssl/http/netty/SecuritySSLNettyHttpServerTransport.java b/...main/java/org/opensearch/security/ssl/http/netty/SecuritySSLNettyHttpServerTransport.java
@@ -155,12 +155,12 @@ protected void configurePipeline(Channel ch) {
         }
     }
 
-    // @Override
+    @Override
     protected ChannelInboundHandlerAdapter createHeaderVerifier() {
         return new Netty4HttpRequestHeaderVerifier(restFilter, threadPool, settings);
     }
 
-    // @Override
+    @Override
     protected ChannelInboundHandlerAdapter createDecompressor() {
         return new Netty4ConditionalDecompressor();
     }