[HUDI-4960] Upgrade jetty version for timeline server (apache#6844)

Co-authored-by: rmahindra123 <rmahindra@Rajeshs-MacBook-Pro.local> Co-authored-by: Y Ethan Guo <ethan.guoyihua@gmail.com>
satishkotha · Dec 11, 2022 · dac2f38 · dac2f38
1 parent 632cab9
commit dac2f38
Show file tree

Hide file tree

Showing 7 changed files with 129 additions and 139 deletions.
diff --git a/hudi-common/src/test/java/org/apache/hudi/common/functional/TestHoodieLogFormat.java b/hudi-common/src/test/java/org/apache/hudi/common/functional/TestHoodieLogFormat.java
@@ -54,7 +54,6 @@
 import org.apache.hudi.exception.HoodieIOException;
 
 import org.apache.avro.Schema;
-import org.apache.avro.generic.GenericData;
 import org.apache.avro.generic.GenericRecord;
 import org.apache.avro.generic.IndexedRecord;
 import org.apache.hadoop.conf.Configuration;

diff --git a/hudi-timeline-service/pom.xml b/hudi-timeline-service/pom.xml
@@ -104,7 +104,7 @@
     <dependency>
       <groupId>io.javalin</groupId>
       <artifactId>javalin</artifactId>
-      <version>2.8.0</version>
+      <version>4.6.0</version>
     </dependency>
 
     <dependency>

diff --git a/hudi-timeline-service/src/main/java/org/apache/hudi/timeline/service/RequestHandler.java b/hudi-timeline-service/src/main/java/org/apache/hudi/timeline/service/RequestHandler.java
diff --git a/hudi-timeline-service/src/main/java/org/apache/hudi/timeline/service/TimelineService.java b/hudi-timeline-service/src/main/java/org/apache/hudi/timeline/service/TimelineService.java
@@ -31,7 +31,6 @@
 import com.beust.jcommander.JCommander;
 import com.beust.jcommander.Parameter;
 import io.javalin.Javalin;
-import io.javalin.core.util.JettyServerUtil;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.log4j.LogManager;
@@ -264,13 +263,12 @@ private int startServiceOnPort(int port) throws IOException {
   }
 
   public int startService() throws IOException {
-    final Server server = timelineServerConf.numThreads == DEFAULT_NUM_THREADS ? JettyServerUtil.defaultServer()
-            : new Server(new QueuedThreadPool(timelineServerConf.numThreads));
+    final Server server = timelineServerConf.numThreads == DEFAULT_NUM_THREADS ? new Server() : new Server(new QueuedThreadPool(timelineServerConf.numThreads));
 
-    app = Javalin.create().server(() -> server);
-    if (!timelineServerConf.compress) {
-      app.disableDynamicGzip();
-    }
+    app = Javalin.create(c -> {
+      c.compressionStrategy(io.javalin.core.compression.CompressionStrategy.NONE);
+      c.server(() -> server);
+    });
 
     requestHandler = new RequestHandler(
         app, conf, timelineServerConf, context, fs, fsViewsManager);

diff --git a/...meline-service/src/main/java/org/apache/hudi/timeline/service/handlers/MarkerHandler.java b/...meline-service/src/main/java/org/apache/hudi/timeline/service/handlers/MarkerHandler.java
@@ -27,7 +27,7 @@
 import org.apache.hudi.timeline.service.handlers.marker.MarkerCreationFuture;
 import org.apache.hudi.timeline.service.handlers.marker.MarkerDirState;
 
-import io.javalin.Context;
+import io.javalin.http.Context;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.log4j.LogManager;

diff --git a/.../src/main/java/org/apache/hudi/timeline/service/handlers/marker/MarkerCreationFuture.java b/.../src/main/java/org/apache/hudi/timeline/service/handlers/marker/MarkerCreationFuture.java
@@ -20,7 +20,7 @@
 
 import org.apache.hudi.common.util.HoodieTimer;
 
-import io.javalin.Context;
+import io.javalin.http.Context;
 import org.apache.log4j.LogManager;
 import org.apache.log4j.Logger;
 

diff --git a/pom.xml b/pom.xml
@@ -165,7 +165,7 @@
     <scalatest.spark3.version>3.1.0</scalatest.spark3.version>
     <surefire-log4j.file>log4j2-surefire.properties</surefire-log4j.file>
     <thrift.version>0.12.0</thrift.version>
-    <jetty.version>9.4.15.v20190215</jetty.version>
+    <jetty.version>9.4.33.v20201020</jetty.version>
     <htrace.version>3.1.0-incubating</htrace.version>
     <hbase.version>2.4.9</hbase.version>
     <h2.version>1.4.199</h2.version>