Get Tomcat setup

Author: robotdan

README.md

@@ -222,8 +222,8 @@ We are looking for Java developers that are interested in helping us build the c
 ```bash
 $ mkdir ~/savant
 $ cd ~/savant
-$ wget http://savant.inversoft.org/org/savantbuild/savant-core/2.0.0-RC.6/savant-2.0.0-RC.7.tar.gz
-$ tar xvfz savant-2.0.0-RC.7.tar.gz
-$ ln -s ./savant-2.0.0-RC.7 current
+$ wget http://savant.inversoft.org/org/savantbuild/savant-core/2.0.0/savant-2.0.0.tar.gz
+$ tar xvfz savant-2.0.0.tar.gz
+$ ln -s ./savant-2.0.0 current
 $ export PATH=$PATH:~/savant/current/bin/
 ```

build.savant

@@ -63,12 +63,12 @@ project(group: "io.fusionauth", name: "java-http", version: "0.4.0-RC.7", licens
 }
 
 // Plugins
-dependency = loadPlugin(id: "org.savantbuild.plugin:dependency:2.0.0-RC.7")
-java = loadPlugin(id: "org.savantbuild.plugin:java:2.0.0-RC.6")
-javaTestNG = loadPlugin(id: "org.savantbuild.plugin:java-testng:2.0.0-RC.6")
-idea = loadPlugin(id: "org.savantbuild.plugin:idea:2.0.0-RC.7")
-release = loadPlugin(id: "org.savantbuild.plugin:release-git:2.0.0-RC.6")
-pom = loadPlugin(id: "org.savantbuild.plugin:pom:2.0.0-RC.6")
+dependency = loadPlugin(id: "org.savantbuild.plugin:dependency:2.0.0")
+java = loadPlugin(id: "org.savantbuild.plugin:java:2.0.0")
+javaTestNG = loadPlugin(id: "org.savantbuild.plugin:java-testng:2.1.0")
+idea = loadPlugin(id: "org.savantbuild.plugin:idea:2.0.0")
+release = loadPlugin(id: "org.savantbuild.plugin:release-git:2.0.0")
+pom = loadPlugin(id: "org.savantbuild.plugin:pom:2.0.0")
 
 java.settings.javaVersion = "21"
 java.settings.compilerArguments = "--add-exports java.base/sun.security.x509=ALL-UNNAMED --add-exports java.base/sun.security.util=ALL-UNNAMED -XDignore.symbol.file"

load-tests/benchmarks/LinuxConfig - Ultimate Web Server Benchmark.md

@@ -29,9 +29,10 @@ ab -n 100000 -c 100 http://localhost:8080/
 Test run on:
 - MacBook Pro 16-inch 2021, Apple M1 Max, 64 GB
 
-| Server    | Requests per second (RPS) | Latency (ms) | Normalized Performance (%) |
-| --------- |---------------------------|--------------| -------------------------- |
-| java-http | 20,265                    | 2.681        | 0                          | 
+| Server        | Requests per second (RPS) | Latency (ms) | Normalized Performance (%) |
+|---------------|---------------------------|--------------|----------------------------|
+| java-http     | 20,265                    | 2.681        | -                          | 
+| apache tomcat | 19,142                    | 5.224        | -                          | 
 
 Note that increasing the worker count to 100 produces very similar RPS with a higher latency.
 
@@ -40,9 +41,10 @@ Note that I believe the results found at the above link were generated w/out usi
 For fun, here is the same test using the `-k` parameter. In practice this may be the better test because most web services sit behind an HTTP proxy that will almost certainly use persistent connections in a pool to the HTTP server even if the connection to the client is not using Keep Alive. 
 
 
-| Server    | Requests per second (RPS) | Latency (ms) | Normalized Performance (%) |
-| --------- |---------------------------|--------------| -------------------------- |
-| java-http | 82,443                    | 0.606        | 0                          | 
+| Server        | Requests per second (RPS) | Latency (ms) | Normalized Performance (%) |
+|---------------|---------------------------|--------------|----------------------------|
+| java-http     | 82,443                    | 0.606        | -                          | 
+| apache tomcat | 75,516                    | 1.324        | -                          | 
 
 ## Test 2: Large File Transfers
 
@@ -66,17 +68,22 @@ ab -n 500 -c 10 http://localhost:8080/file?size=10485760
 Test run on:
 - MacBook Pro 16-inch 2021, Apple M1 Max, 64 GB
 
-| Server    | Requests per second (RPS) | Latency (ms) | Transfer Rate (MB/sec) | Normalized Performance (%) |
-| --------- |---------------------------|--------------|------------------------|----------------------------|
-| java-http | 625                       | 15.998       | 6,251                  |                            | 
+| Server        | Requests per second (RPS) | Latency (ms) | Transfer Rate (MB/sec) | Normalized Performance (%) |
+|---------------|---------------------------|--------------|------------------------|----------------------------|
+| java-http     | 625                       | 15.998       | 6,251                  |                            | 
+| apache tomcat | 503                       | 19.857       | 5,036                  |                            |  
+
+Note to calculate the Transfer Rate in MB/sec, I am taking the `ab` result of `Kbytes/sec` and dividing by `1024`.
 
 Same test with `-k` which assumes we are using an HTTP proxy with Keep Alive.
 
 
-| Server    | Requests per second (RPS) | Latency (ms) | Transfer Rate (MB/sec) | Normalized Performance (%) |
-| --------- |---------------------------|--------------|------------------------|----------------------------|
-| java-http | 682                       | 14.647       | 6,632                  |                            | 
+| Server        | Requests per second (RPS) | Latency (ms) | Transfer Rate (MB/sec) | Normalized Performance (%) |
+|---------------|---------------------------|--------------|------------------------|----------------------------|
+| java-http     | 682                       | 14.647       | 6,632                  |                            | 
+| apache tomcat | 229                       | 43.518       | 2,297                  |                            | 
 
+It is unexpected that Apache Tomcat would perform worse with `-k` enabled. It is possible that Tomcat is not handling HTTP/1.0 keep alive properly which could cause the socket to timeout reducing throughput. This is only a guess.
 
 ## Test 2: High Concurrency Performance
 
@@ -94,3 +101,5 @@ ab -n 20000 -c 1000 http://localhost:8080/
 - -n 20000 → Total number of requests (20,000)
 - -c 1000 → Number of concurrent users (1,000)
 - http://localhost:8080/ → URL of the test page
+
+Note, I have been unable to run this command on macOS. I receive an error `socket: Too many open files (24)`. The default on macOS is `256` (`ulimit -n -S`). If I increase the local limit using `ulimit -n -S 16384`, I get past this error and receive another error. `apr_socket_recv: Connection reset by peer (54)`. My guess is the server cannot accept this many sockets connections all at once and the Server Socket is reaching the configured backlog and puking. 

load-tests/self/src/main/java/io/fusionauth/http/load/LoadHandler.java

@@ -22,13 +22,14 @@
 import java.util.Base64;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 import io.fusionauth.http.server.HTTPHandler;
 import io.fusionauth.http.server.HTTPRequest;
 import io.fusionauth.http.server.HTTPResponse;
 
 public class LoadHandler implements HTTPHandler {
-  private final Map<Integer, byte[]> Blobs = new HashMap<>();
+  private static final Map<Integer, byte[]> Blobs = new HashMap<>();
 
   @Override
   public void handle(HTTPRequest req, HTTPResponse res) {
@@ -55,32 +56,31 @@ private void handleFailure(HTTPRequest req, HTTPResponse res) {
   }
 
   private void handleFile(HTTPRequest req, HTTPResponse res) {
-    System.out.println("/file");
     int size = 1024 * 1024;
     var requestedSize = req.getURLParameter("size");
     if (requestedSize != null) {
       size = Integer.parseInt(requestedSize);
-      System.out.println("Requested size: " + size);
-    } else {
-      System.out.println("Default size: " + size);
     }
 
+    // Ensure we only build one file
     byte[] blob = Blobs.get(size);
     if (blob == null) {
-      System.out.println("Build file with size : " + size);
-      String s = "Lorem ipsum dolor sit amet";
-      String body = s.repeat(size / s.length() + (size % s.length()));
-      assert body.length() == size;
-      Blobs.put(size, body.getBytes(StandardCharsets.UTF_8));
-      blob = Blobs.get(size);
-      assert blob != null;
-    } else {
-      System.out.println("Already built file with size: " + size);
+      synchronized (Blobs) {
+        blob = Blobs.get(size);
+        if (blob == null) {
+          System.out.println("Build file with size : " + size);
+          String s = "Lorem ipsum dolor sit amet";
+          String body = s.repeat(size / s.length() + (size % s.length()));
+          assert body.length() == size;
+          Blobs.put(size, body.getBytes(StandardCharsets.UTF_8));
+          blob = Blobs.get(size);
+          assert blob != null;
+        }
+      }
     }
 
     res.setStatus(200);
     res.setContentType("application/octet-stream");
-    System.out.println("Write back a file with [" + blob.length + "] bytes");
     res.setContentLength(blob.length);
 
     try (OutputStream os = res.getOutputStream()) {

load-tests/tomcat/build.savant

@@ -15,8 +15,6 @@ import java.nio.file.Paths
  * either express or implied. See the License for the specific
  * language governing permissions and limitations under the License.
  */
-restifyVersion = "4.1.2"
-testngVersion = "7.6.1"
 
 project(group: "io.fusionauth", name: "tomcat", version: "0.1.10", licenses: ["ApacheV2_0"]) {
   workflow {
@@ -50,7 +48,7 @@ project(group: "io.fusionauth", name: "tomcat", version: "0.1.10", licenses: ["A
 // Plugins
 java = loadPlugin(id: "org.savantbuild.plugin:java:2.0.0")
 idea = loadPlugin(id: "org.savantbuild.plugin:idea:2.0.0")
-tomcat = loadPlugin(id: "org.savantbuild.plugin:tomcat:2.0.0")
+tomcat = loadPlugin(id: "org.savantbuild.plugin:tomcat:2.0.2")
 webapp = loadPlugin(id: "org.savantbuild.plugin:webapp:2.0.0")
 
 java.settings.javaVersion = "17"
@@ -73,6 +71,7 @@ target(name: "jar", description: "Builds the project JARs", dependsOn: ["compile
 
 target(name: "war", description: "Builds the project WAR (exploded and JAR)", dependsOn: ["jar"]) {
   webapp.build()
+  webapp.war()
 }
 
 target(name: "tomcat", description: "Builds the Tomcat runtime", dependsOn: ["war"]) {
@@ -82,3 +81,9 @@ target(name: "tomcat", description: "Builds the Tomcat runtime", dependsOn: ["wa
 target(name: "idea", description: "Updates the IntelliJ IDEA module file") {
   idea.iml()
 }
+
+target(name: "start", description: "Starts the Tomcat server for load testing!", dependsOn: ["tomcat"]) {
+  if (new ProcessBuilder('./catalina.sh', 'run').directory(new File("build/dist/tomcat/apache-tomcat/bin")).inheritIO().start().waitFor() != 0) {
+    fail("Unable to start the server!")
+  }
+}

load-tests/tomcat/src/main/java/io/fusionauth/http/load/LoadServlet.java

@@ -18,11 +18,17 @@
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.io.InputStream;
-import java.io.PrintWriter;
+import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
 import java.util.Base64;
+import java.util.HashMap;
+import java.util.Map;
 
 public class LoadServlet extends HttpServlet {
+  private static final Map<Integer, byte[]> Blobs = new HashMap<>();
+
   @Override
   protected void doGet(HttpServletRequest req, HttpServletResponse res) {
     doPost(req, res);
@@ -32,6 +38,15 @@ protected void doGet(HttpServletRequest req, HttpServletResponse res) {
   protected void doPost(HttpServletRequest req, HttpServletResponse res) {
     // Note that this should be mostly the same between all load tests.
     // - See load-tests/self
+    switch (req.getPathInfo()) {
+      case "/" -> handleNoOp();
+      case "/hello" -> handleHello(req, res);
+      case "/file" -> handleFile(req, res);
+      case "/load" -> handleLoad(req, res);
+      default -> handleFailure(req, res);
+    }
+
+
     try (InputStream is = req.getInputStream()) {
       byte[] body = is.readAllBytes();
       byte[] result = Base64.getEncoder().encode(body);
@@ -43,4 +58,86 @@ protected void doPost(HttpServletRequest req, HttpServletResponse res) {
       res.setStatus(500);
     }
   }
+
+  private void handleFailure(HttpServletRequest req, HttpServletResponse res) {
+    // Path does not match handler.
+    res.setStatus(400);
+    byte[] response = ("Invalid path [" + req.getPathInfo() + "]. Supported paths include [/, /text, /file, /echo].").getBytes(StandardCharsets.UTF_8);
+    res.setContentLength(response.length);
+    res.setContentType("text/plain");
+    try {
+      res.getOutputStream().write(response);
+    } catch (IOException e) {
+      res.setStatus(500);
+    }
+  }
+
+  private void handleFile(HttpServletRequest req, HttpServletResponse res) {
+    int size = 1024 * 1024;
+    var requestedSize = req.getParameter("size");
+    if (requestedSize != null) {
+      size = Integer.parseInt(requestedSize);
+    }
+
+    // Ensure we only build one file
+    byte[] blob = Blobs.get(size);
+    if (blob == null) {
+      synchronized (Blobs) {
+        blob = Blobs.get(size);
+        if (blob == null) {
+          System.out.println("Build file with size : " + size);
+          String s = "Lorem ipsum dolor sit amet";
+          String body = s.repeat(size / s.length() + (size % s.length()));
+          assert body.length() == size;
+          Blobs.put(size, body.getBytes(StandardCharsets.UTF_8));
+          blob = Blobs.get(size);
+          assert blob != null;
+        }
+      }
+    }
+
+    res.setStatus(200);
+    res.setContentType("application/octet-stream");
+    res.setContentLength(blob.length);
+
+    try (OutputStream os = res.getOutputStream()) {
+      os.write(blob);
+      os.flush();
+    } catch (Exception e) {
+      res.setStatus(500);
+    }
+  }
+
+  private void handleHello(HttpServletRequest req, HttpServletResponse res) {
+    // Hello world
+    res.setStatus(200);
+    res.setContentType("text/plain");
+    byte[] response = "Hello world".getBytes(StandardCharsets.UTF_8);
+    res.setContentLength(response.length);
+
+    try (OutputStream os = res.getOutputStream()) {
+      os.write(response);
+      os.flush();
+    } catch (Exception e) {
+      res.setStatus(500);
+    }
+  }
+
+  private void handleLoad(HttpServletRequest req, HttpServletResponse res) {
+    // Note that this should be mostly the same between all load tests.
+    // - See load-tests/tomcat
+    try (InputStream is = req.getInputStream()) {
+      byte[] body = is.readAllBytes();
+      byte[] result = Base64.getEncoder().encode(body);
+      res.setContentLength(result.length);
+      res.setContentType("text/plain");
+      res.setStatus(200);
+      res.getOutputStream().write(result);
+    } catch (Exception e) {
+      res.setStatus(500);
+    }
+  }
+
+  private void handleNoOp() {
+  }
 }

load-tests/tomcat/src/main/tomcat/bin/PLACEHOLDER

@@ -13,7 +13,20 @@
         - maxParameterCount: A value of less than 0 means no limit.
         - maxPostSize: The limit can be disabled by setting this attribute to a value less than zero.
      -->
-    <Connector port="8080" protocol="HTTP/1.1" connectionTimeout="20000" compression="on" maxHttpHeaderSize="${cleanspeak-management-interface.http.max-header-size:-10240}" maxParameterCount="-1" maxPostSize="-1" relaxedPathChars="${cleanspeak-management-interface.http.relaxed-path-chars:-&#x5B;&#x5D;&#x7C;}" relaxedQueryChars="${cleanspeak-management-interface.http.relaxed-query-chars:-&#x5B;&#x5D;&#x7C;&#x7B;&#x7D;&#x5E;&#x5C;&#x60;&#x22;&#x3C;&#x3E;}" redirectPort="8443" URIEncoding="UTF-8"/>
+    <Connector port="8080"
+               protocol="HTTP/1.1"
+               connectionTimeout="20000"
+               compression="on"
+               maxHttpHeaderSize="10240"
+               maxParameterCount="-1"
+               maxPostSize="-1"
+               relaxedPathChars="&#x5B;&#x5D;&#x7C;"
+               relaxedQueryChars="&#x5B;&#x5D;&#x7C;&#x7B;&#x7D;&#x5E;&#x5C;&#x60;&#x22;&#x3C;&#x3E;"
+               redirectPort="8443"
+               acceptCount="200"
+               maxConnections="1000"
+               maxThreads="200"
+               URIEncoding="UTF-8"/>
     <Engine name="Catalina" defaultHost="localhost">
       <Host name="localhost" autoDeploy="false" unpackWARs="false">
         <Context path="" docBase="${catalina.base}/../web">
@@ -23,4 +36,4 @@
       </Host>
     </Engine>
   </Service>
-</Server>
+</Server>

load-tests/tomcat/src/main/tomcat/bin/gitkeep

@@ -21,6 +21,6 @@
   </servlet>
   <servlet-mapping>
     <servlet-name>load</servlet-name>
-    <url-pattern>/load</url-pattern>
+    <url-pattern>/*</url-pattern>
   </servlet-mapping>
 </web-app>