Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to Apache Kafka 3.7.0 #148

Merged
merged 4 commits into from
Feb 27, 2024
Merged

Upgrade to Apache Kafka 3.7.0 #148

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
98f1cd3
Upgrade to Apache Kafka 3.7
k-wall Feb 23, 2024
ff2c602
Update substitutions to reflect changes in Kafka 3.7.0
k-wall Feb 23, 2024
8ac9dce
Remove static initializer from LogSegment class when building in nati…
ozangunalp Feb 26, 2024
2d650e3
Remove repository override
k-wall Feb 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions kafka-server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@
<groupId>org.apache.kafka</groupId>
<artifactId>kafka_2.13</artifactId>
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-metadata</artifactId>
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-server-common</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions kafka-server/src/main/java/com/ozangunalp/kafka/server/Storage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import org.jboss.logging.Logger;

import kafka.server.KafkaConfig;
import kafka.server.MetaProperties;
import org.apache.kafka.metadata.properties.MetaProperties;
import kafka.tools.StorageTool;
import scala.collection.immutable.Seq;
import scala.jdk.CollectionConverters;
Expand Down Expand Up @@ -58,7 +58,7 @@ public static void formatStorageFromConfig(KafkaConfig config, String clusterId,
}

public static void formatStorage(List<String> directories, String clusterId, int nodeId, boolean ignoreFormatted) {
MetaProperties metaProperties = new MetaProperties(clusterId, nodeId);
MetaProperties metaProperties = new MetaProperties.Builder().setClusterId(clusterId).setNodeId(nodeId).build();
Seq<String> dirs = CollectionConverters.ListHasAsScala(directories).asScala().toSeq();
StorageTool.formatCommand(LoggingOutputStream.loggerPrintStream(LOGGER), dirs, metaProperties,
MINIMUM_BOOTSTRAP_VERSION, ignoreFormatted);
Expand Down
20 changes: 18 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
<quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
<quarkus.platform.version>3.7.4</quarkus.platform.version>

<kafka.version>3.6.1</kafka.version>
<kafka.version>3.7.0</kafka.version>
<zookeeper.version>3.9.1</zookeeper.version>
<scala.version>2.13.13</scala.version>

Expand Down Expand Up @@ -123,6 +123,11 @@
<artifactId>kafka-storage</artifactId>
<version>${kafka.version}</version>
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-metadata</artifactId>
<version>${kafka.version}</version>
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-group-coordinator</artifactId>
Expand Down Expand Up @@ -207,6 +212,17 @@
</dependencies>
</dependencyManagement>

<!-- TMP to test out the staged RC. Do Not Merge -->
<repositories>
<repository>
<id>apache staging</id>
<url>https://repository.apache.org/content/groups/staging/</url>
<releases>
<enabled>true</enabled>
</releases>
</repository>
</repositories>

<dependencies>
<!-- Test -->
<dependency>
Expand Down Expand Up @@ -436,4 +452,4 @@
</build>
</profile>
</profiles>
</project>
</project>
5 changes: 4 additions & 1 deletion .../java/com/ozangunalp/kafka/server/extension/deployment/KafkaServerExtensionProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,9 +127,12 @@ void build(BuildProducer<ReflectiveClassBuildItem> reflectiveClass,
"org.apache.kafka.common.security.oauthbearer.internals.expiring.ExpiringCredentialRefreshingLogin"));
producer.produce(new RuntimeInitializedClassBuildItem(
"org.apache.kafka.common.security.kerberos.KerberosLogin"));

producer.produce(new RuntimeInitializedClassBuildItem(
"org.apache.kafka.storage.internals.log.LogSegment"));

producer.produce(new RuntimeInitializedClassBuildItem("kafka.server.DelayedFetchMetrics$"));
producer.produce(new RuntimeInitializedClassBuildItem("kafka.server.DelayedProduceMetrics$"));
producer.produce(new RuntimeInitializedClassBuildItem("kafka.server.DelayedRemoteFetchMetrics$"));
producer.produce(new RuntimeInitializedClassBuildItem("kafka.server.DelayedDeleteRecordsMetrics$"));

reflectiveClass.produce(ReflectiveClassBuildItem.builder(org.apache.kafka.common.metrics.JmxReporter.class).build());
Expand Down
17 changes: 1 addition & 16 deletions ...src/main/java/com/ozangunalp/kafka/server/extension/runtime/KafkaServerSubstitutions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
import org.jboss.logmanager.LogContext;

import com.oracle.svm.core.annotate.Alias;
import com.oracle.svm.core.annotate.Delete;
import com.oracle.svm.core.annotate.InjectAccessors;
import com.oracle.svm.core.annotate.Substitute;
import com.oracle.svm.core.annotate.TargetClass;
Expand Down Expand Up @@ -105,21 +104,7 @@ public long randomSegmentJitter() {

}

@TargetClass(className = "kafka.log.LogFlushStats$")
final class Target_LogFlushStats {

@Delete
private static Target_com_yammer_metrics_core_Timer logFlushTimer;

}

// Used in kafka.log.LogFlushStats.logFlushTimer
@TargetClass(className = "com.yammer.metrics.core.Timer")
final class Target_com_yammer_metrics_core_Timer {

}

@TargetClass(className = "kafka.log.LogSegment")
@TargetClass(className = "org.apache.kafka.storage.internals.log.LogSegment")
final class Target_LogSegment {

@Alias
Expand Down
Loading