Merge branch 'master' into bburkholder/id-schema

slackhq · Feb 12, 2024 · a4c5e3d · a4c5e3d
2 parents 961df72 + 4736354
commit a4c5e3d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml
@@ -83,7 +83,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.1.0</version>
+                <version>3.2.5</version>
                 <configuration>
                     <forkMode>always</forkMode>
                     <redirectTestOutputToFile>true</redirectTestOutputToFile>

diff --git a/kaldb/pom.xml b/kaldb/pom.xml
@@ -17,17 +17,17 @@
         <javac.target>21</javac.target>
         <uberjar.name>kaldb</uberjar.name>
         <http.core.version>4.4.16</http.core.version>
-        <protobuf.version>3.25.0</protobuf.version>
+        <protobuf.version>3.25.2</protobuf.version>
         <grpc.version>1.60.1</grpc.version>
         <micrometer.version>1.11.0</micrometer.version>
         <armeria.version>1.26.4</armeria.version>
         <kafka.version>3.5.0</kafka.version>
-        <jackson.version>2.16.0</jackson.version>
+        <jackson.version>2.16.1</jackson.version>
         <jackson.databind.version>2.16.0</jackson.databind.version>
         <lucene.version>9.7.0</lucene.version>
         <opensearch.version>2.11.1</opensearch.version>
         <curator.version>5.6.0</curator.version>
-        <log4j.version>2.20.0</log4j.version>
+        <log4j.version>2.22.1</log4j.version>
         <aws.sdk.version>2.22.9</aws.sdk.version>
         <error.prone.version>2.23.0</error.prone.version>
         <junit.jupiter.version>5.10.0</junit.jupiter.version>
@@ -420,7 +420,7 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>5.5.0</version>
+            <version>5.10.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -751,7 +751,7 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>3.1.0</version>
+                    <version>3.2.5</version>
                     <configuration>
                         <argLine>--enable-preview</argLine>
                         <trimStackTrace>false</trimStackTrace>

diff --git a/kaldb/src/main/java/com/slack/kaldb/chunkManager/RecoveryChunkManager.java b/kaldb/src/main/java/com/slack/kaldb/chunkManager/RecoveryChunkManager.java
@@ -41,7 +41,8 @@
 public class RecoveryChunkManager<T> extends ChunkManagerBase<T> {
   private static final Logger LOG = LoggerFactory.getLogger(RecoveryChunkManager.class);
   // This field controls the maximum amount of time we wait for a rollover to complete.
-  private static final int MAX_ROLLOVER_MINUTES = 20;
+  private static final int MAX_ROLLOVER_MINUTES =
+      Integer.parseInt(System.getProperty("kalDb.recovery.maxRolloverMins", "90"));
 
   private final ChunkFactory<T> recoveryChunkFactory;
   private final ChunkRolloverFactory chunkRolloverFactory;