You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by cm...@apache.org on 2021/05/20 22:42:32 UTC

[kafka] branch trunk updated (b56d9e4 -> f50f13d)

This is an automated email from the ASF dual-hosted git repository.

cmccabe pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/kafka.git.


    from b56d9e4  KAFKA-12779: KIP-740, Clean up public API in TaskId and fix TaskMetadata#taskId() (#10735)
     add f50f13d  KAFKA-12342: Remove MetaLogShim and use RaftClient directly (#10705)

No new revisions were added by this update.

Summary of changes:
 build.gradle                                       |   3 +-
 checkstyle/import-control.xml                      |   9 +-
 core/src/main/scala/kafka/raft/RaftManager.scala   |  27 +-
 .../src/main/scala/kafka/server/BrokerServer.scala |  29 ++-
 .../server/BrokerToControllerChannelManager.scala  |  20 +-
 .../main/scala/kafka/server/ControllerServer.scala |  23 +-
 .../main/scala/kafka/server/KafkaRaftServer.scala  |  11 +-
 .../server/metadata/BrokerMetadataListener.scala   |  95 ++++---
 .../main/scala/kafka/tools/DumpLogSegments.scala   |   2 +-
 .../main/scala/kafka/tools/TestRaftServer.scala    |  15 +-
 .../java/kafka/testkit/KafkaClusterTestKit.java    |  11 +-
 .../metadata/BrokerMetadataListenerTest.scala      |  51 ++--
 .../unit/kafka/tools/DumpLogSegmentsTest.scala     |   2 +-
 .../apache/kafka/controller/QuorumController.java  | 287 ++++++++++++---------
 .../kafka}/metadata/MetadataRecordSerde.java       |   2 +-
 .../org/apache/kafka/metalog/MetaLogLeader.java    |  58 -----
 .../org/apache/kafka/metalog/MetaLogListener.java  |  55 ----
 .../org/apache/kafka/metalog/MetaLogManager.java   |  96 -------
 .../kafka/controller/MockSnapshotWriter.java       |  38 ++-
 .../kafka/controller/QuorumControllerTest.java     |  25 +-
 .../kafka/controller/QuorumControllerTestEnv.java  |   2 +-
 .../kafka}/metadata/MetadataRecordSerdeTest.java   |   4 +-
 .../org/apache/kafka/metalog/LocalLogManager.java  | 181 ++++++++++---
 .../apache/kafka/metalog/LocalLogManagerTest.java  |  42 +--
 .../kafka/metalog/LocalLogManagerTestEnv.java      |  31 ++-
 .../kafka/metalog/MockMetaLogManagerListener.java  |  82 ++++--
 .../org/apache/kafka/raft/KafkaRaftClient.java     |  78 +++---
 .../java/org/apache/kafka/raft/LeaderAndEpoch.java |  24 +-
 .../java/org/apache/kafka/raft/QuorumState.java    |   4 +
 .../java/org/apache/kafka/raft/RaftClient.java     |  52 +++-
 .../org/apache/kafka/raft/ReplicatedCounter.java   |  23 +-
 .../kafka/raft/metadata/MetaLogRaftShim.java       | 152 -----------
 .../kafka/raft/KafkaRaftClientSnapshotTest.java    |   2 +-
 .../org/apache/kafka/raft/KafkaRaftClientTest.java |   6 +-
 .../test/java/org/apache/kafka/raft/MockLog.java   | 104 +-------
 .../apache/kafka/raft/RaftClientTestContext.java   |  30 ++-
 .../kafka/snapshot/MockRawSnapshotReader.java      |  57 ++++
 .../kafka/snapshot/MockRawSnapshotWriter.java      |  88 +++++++
 .../apache/kafka/shell/MetadataNodeManager.java    |  40 +--
 .../org/apache/kafka/shell/SnapshotFileReader.java |  43 ++-
 40 files changed, 960 insertions(+), 944 deletions(-)
 rename {raft/src/main/java/org/apache/kafka/raft => metadata/src/main/java/org/apache/kafka}/metadata/MetadataRecordSerde.java (96%)
 delete mode 100644 metadata/src/main/java/org/apache/kafka/metalog/MetaLogLeader.java
 delete mode 100644 metadata/src/main/java/org/apache/kafka/metalog/MetaLogListener.java
 delete mode 100644 metadata/src/main/java/org/apache/kafka/metalog/MetaLogManager.java
 rename {raft/src/test/java/org/apache/kafka/raft => metadata/src/test/java/org/apache/kafka}/metadata/MetadataRecordSerdeTest.java (98%)
 delete mode 100644 raft/src/main/java/org/apache/kafka/raft/metadata/MetaLogRaftShim.java
 create mode 100644 raft/src/test/java/org/apache/kafka/snapshot/MockRawSnapshotReader.java
 create mode 100644 raft/src/test/java/org/apache/kafka/snapshot/MockRawSnapshotWriter.java