From de99f400c617d047783feeafe8452a2ab5bb247e Mon Sep 17 00:00:00 2001 From: Bryan Burkholder <771133+bryanlb@users.noreply.github.com> Date: Thu, 8 Feb 2024 16:13:59 -0700 Subject: [PATCH 1/6] Bump hardcoded max rollover time, allow overriding default (#766) Co-authored-by: Bryan Burkholder --- .../com/slack/kaldb/chunkManager/RecoveryChunkManager.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kaldb/src/main/java/com/slack/kaldb/chunkManager/RecoveryChunkManager.java b/kaldb/src/main/java/com/slack/kaldb/chunkManager/RecoveryChunkManager.java index 8e7067cb7d..f7fc03fc30 100644 --- 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 extends ChunkManagerBase { 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 recoveryChunkFactory; private final ChunkRolloverFactory chunkRolloverFactory; From e4e08473b24afcab870b416c0e6f5d175bf0c940 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 9 Feb 2024 14:31:46 -0700 Subject: [PATCH 2/6] Bump jackson.version from 2.16.0 to 2.16.1 (#759) Bumps `jackson.version` from 2.16.0 to 2.16.1. Updates `com.fasterxml.jackson.core:jackson-core` from 2.16.0 to 2.16.1 - [Commits](https://github.com/FasterXML/jackson-core/compare/jackson-core-2.16.0...jackson-core-2.16.1) Updates `com.fasterxml.jackson.core:jackson-annotations` from 2.16.0 to 2.16.1 - [Commits](https://github.com/FasterXML/jackson/commits) Updates `com.fasterxml.jackson.module:jackson-module-afterburner` from 2.16.0 to 2.16.1 - [Commits](https://github.com/FasterXML/jackson-modules-base/compare/jackson-modules-base-2.16.0...jackson-modules-base-2.16.1) Updates `com.fasterxml.jackson.datatype:jackson-datatype-jsr310` from 2.16.0 to 2.16.1 Updates `com.fasterxml.jackson.dataformat:jackson-dataformat-yaml` from 2.16.0 to 2.16.1 - [Commits](https://github.com/FasterXML/jackson-dataformats-text/compare/jackson-dataformats-text-2.16.0...jackson-dataformats-text-2.16.1) Updates `com.fasterxml.jackson.dataformat:jackson-dataformat-xml` from 2.16.0 to 2.16.1 - [Commits](https://github.com/FasterXML/jackson-dataformat-xml/compare/jackson-dataformat-xml-2.16.0...jackson-dataformat-xml-2.16.1) --- updated-dependencies: - dependency-name: com.fasterxml.jackson.core:jackson-core dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.fasterxml.jackson.core:jackson-annotations dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.fasterxml.jackson.module:jackson-module-afterburner dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.fasterxml.jackson.datatype:jackson-datatype-jsr310 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.fasterxml.jackson.dataformat:jackson-dataformat-xml dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Bryan Burkholder <771133+bryanlb@users.noreply.github.com> --- kaldb/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kaldb/pom.xml b/kaldb/pom.xml index 3522d6152c..dc8fa877ae 100644 --- a/kaldb/pom.xml +++ b/kaldb/pom.xml @@ -22,7 +22,7 @@ 1.11.0 1.26.4 3.5.0 - 2.16.0 + 2.16.1 2.16.0 9.7.0 2.11.1 From a7b60a751ecf3759b3180b904efe3d496110b2d8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 9 Feb 2024 14:41:45 -0700 Subject: [PATCH 3/6] Bump log4j.version from 2.20.0 to 2.22.1 (#758) Bumps `log4j.version` from 2.20.0 to 2.22.1. Updates `org.apache.logging.log4j:log4j-slf4j2-impl` from 2.20.0 to 2.22.1 Updates `org.apache.logging.log4j:log4j-api` from 2.20.0 to 2.22.1 Updates `org.apache.logging.log4j:log4j-core` from 2.20.0 to 2.22.1 Updates `org.apache.logging.log4j:log4j-layout-template-json` from 2.20.0 to 2.22.1 --- updated-dependencies: - dependency-name: org.apache.logging.log4j:log4j-slf4j2-impl dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.apache.logging.log4j:log4j-api dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.apache.logging.log4j:log4j-core dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.apache.logging.log4j:log4j-layout-template-json dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- kaldb/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kaldb/pom.xml b/kaldb/pom.xml index dc8fa877ae..024c745d6b 100644 --- a/kaldb/pom.xml +++ b/kaldb/pom.xml @@ -27,7 +27,7 @@ 9.7.0 2.11.1 5.6.0 - 2.20.0 + 2.22.1 2.22.9 2.23.0 5.10.0 From 2b9576fcd8357da1ecdc1d648dc68f650364a42c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 9 Feb 2024 14:55:43 -0700 Subject: [PATCH 4/6] Bump protobuf.version from 3.25.0 to 3.25.2 (#755) Bumps `protobuf.version` from 3.25.0 to 3.25.2. Updates `com.google.protobuf:protobuf-java` from 3.25.0 to 3.25.2 - [Release notes](https://github.com/protocolbuffers/protobuf/releases) - [Changelog](https://github.com/protocolbuffers/protobuf/blob/main/protobuf_release.bzl) - [Commits](https://github.com/protocolbuffers/protobuf/compare/v3.25.0...v3.25.2) Updates `com.google.protobuf:protobuf-java-util` from 3.25.0 to 3.25.2 --- updated-dependencies: - dependency-name: com.google.protobuf:protobuf-java dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.google.protobuf:protobuf-java-util dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- kaldb/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kaldb/pom.xml b/kaldb/pom.xml index 024c745d6b..aa9a7a367b 100644 --- a/kaldb/pom.xml +++ b/kaldb/pom.xml @@ -17,7 +17,7 @@ 21 kaldb 4.4.16 - 3.25.0 + 3.25.2 1.60.1 1.11.0 1.26.4 From c550698af803d82e65ffbb6e321ff4da00ac438b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 9 Feb 2024 16:01:10 -0700 Subject: [PATCH 5/6] Bump org.mockito:mockito-core from 5.5.0 to 5.10.0 (#756) Bumps [org.mockito:mockito-core](https://github.com/mockito/mockito) from 5.5.0 to 5.10.0. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v5.5.0...v5.10.0) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- kaldb/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kaldb/pom.xml b/kaldb/pom.xml index aa9a7a367b..7b4f8ceae3 100644 --- a/kaldb/pom.xml +++ b/kaldb/pom.xml @@ -420,7 +420,7 @@ org.mockito mockito-core - 5.5.0 + 5.10.0 test From 4736354a8ec143adfc9aeb138fcca65222ae6ecf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 9 Feb 2024 16:32:47 -0700 Subject: [PATCH 6/6] Bump org.apache.maven.plugins:maven-surefire-plugin from 3.1.0 to 3.2.5 (#757) Bumps [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.1.0 to 3.2.5. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.1.0...surefire-3.2.5) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- benchmarks/pom.xml | 2 +- kaldb/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml index 4ad7b7c110..17f0a950fb 100644 --- a/benchmarks/pom.xml +++ b/benchmarks/pom.xml @@ -83,7 +83,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.1.0 + 3.2.5 always true diff --git a/kaldb/pom.xml b/kaldb/pom.xml index 7b4f8ceae3..709b02cdc4 100644 --- a/kaldb/pom.xml +++ b/kaldb/pom.xml @@ -751,7 +751,7 @@ maven-surefire-plugin - 3.1.0 + 3.2.5 --enable-preview false