派生自
oss-mirrors / ICV / kafka
源项目有可见性限制。
-
由 Ismael Juma 创作于
Conflicts: * Makefile: take license addition, keep ce-kafka version otherwise. * build.gradle: take upstream dependency additions to jmh-benchmarks. * Partition.scala: take upstream changes, conflicts due to Log versus AbstractLog. * Log.scala: take upstream changes and move method definitions below vars/vals (like upstream). * LogCleaner.scala: take upstream changes, conflicts were trivial. * LogManager.scala: aside from Log/AbstractLog conflicts, the main source of divergence is that ce-kafka doesn't clean snapshots like upstream. This means we don't need to group logs by log dir before checkpointing recovery offsets in `truncateTo`. * ReplicaManager.scala: trivial conflict due to AbstractLog/Log divergence. * PartitionLockTest.scala: adjust to removed parameters from `makeLeader` and `createLog`. * PartitionTest.scala: adjust to removed parameters from `makeLeader`, `createLogIfNotExists`, `makeFollower`. Also add two tests that were seemingly missed before: `testUnderReplicatedPartitionsCorrectSemantics` and `testUpdateAssignmentAndIsr`. * PartitionMakeFollowerBenchmark.java: adjust to removed parameters from `makeFollower` and `createLogIfNotExists`. * UpdateFollowerFetchStateBenchmark.java: adjust to removed parameters from `makeLeader`. * upgrade_test.py: conflict was due to tiered changes, took upstream changes. Compilation errors: * ObserverPartitionTest.scala: adjust to removed parameters from `makeLeader`, `createLogIfNotExists`. * ReplicaManagerTest.scala: adjust to removed parameters from `makeLeader`, `createLogIfNotExists`, `createPartition`. * PartitionBenchmark.java: adjust to removed parameters from `makeLeader`. * HighwatermarkCheckpointBench.java: pass tier related parameters to `ReplicaManager` and `LogManager`. * MergedLog.scala: add `parentDir` and `parentDirFile` methods. * confluent/master: MINOR: Fix a number of warnings in mirror/mirror-client (#8074) Add license header to Makefile KAFKA-9373: Reduce shutdown time by avoiding unnecessary loading of indexes (#8346) MINOR: Improve performance of checkpointHighWatermarks, patch 1/2 (#6741) MINOR: Add synchronization to the protocol name check (#8349) MINOR: Allow topics with `null` leader on MockAdminClient createTopic. (#8345) DOCS-3625: Add section to config topic: parameters controlled by Kafka Streams (#8268) KAFKA-9573: Fix JVM options to run early versions of Kafka on the latest JVMs (#8138) KAFKA-9758: Doc changes for KIP-523 and KIP-527 (#8343) KAFKA-9752; New member timeout can leave group rebalance stuck (#8339) HOTFIX: fix log message in version probing system test (#8341) KAFKA-9700: Fix negative estimatedCompressionRatio (#8285)
由 Ismael Juma 创作于Conflicts: * Makefile: take license addition, keep ce-kafka version otherwise. * build.gradle: take upstream dependency additions to jmh-benchmarks. * Partition.scala: take upstream changes, conflicts due to Log versus AbstractLog. * Log.scala: take upstream changes and move method definitions below vars/vals (like upstream). * LogCleaner.scala: take upstream changes, conflicts were trivial. * LogManager.scala: aside from Log/AbstractLog conflicts, the main source of divergence is that ce-kafka doesn't clean snapshots like upstream. This means we don't need to group logs by log dir before checkpointing recovery offsets in `truncateTo`. * ReplicaManager.scala: trivial conflict due to AbstractLog/Log divergence. * PartitionLockTest.scala: adjust to removed parameters from `makeLeader` and `createLog`. * PartitionTest.scala: adjust to removed parameters from `makeLeader`, `createLogIfNotExists`, `makeFollower`. Also add two tests that were seemingly missed before: `testUnderReplicatedPartitionsCorrectSemantics` and `testUpdateAssignmentAndIsr`. * PartitionMakeFollowerBenchmark.java: adjust to removed parameters from `makeFollower` and `createLogIfNotExists`. * UpdateFollowerFetchStateBenchmark.java: adjust to removed parameters from `makeLeader`. * upgrade_test.py: conflict was due to tiered changes, took upstream changes. Compilation errors: * ObserverPartitionTest.scala: adjust to removed parameters from `makeLeader`, `createLogIfNotExists`. * ReplicaManagerTest.scala: adjust to removed parameters from `makeLeader`, `createLogIfNotExists`, `createPartition`. * PartitionBenchmark.java: adjust to removed parameters from `makeLeader`. * HighwatermarkCheckpointBench.java: pass tier related parameters to `ReplicaManager` and `LogManager`. * MergedLog.scala: add `parentDir` and `parentDirFile` methods. * confluent/master: MINOR: Fix a number of warnings in mirror/mirror-client (#8074) Add license header to Makefile KAFKA-9373: Reduce shutdown time by avoiding unnecessary loading of indexes (#8346) MINOR: Improve performance of checkpointHighWatermarks, patch 1/2 (#6741) MINOR: Add synchronization to the protocol name check (#8349) MINOR: Allow topics with `null` leader on MockAdminClient createTopic. (#8345) DOCS-3625: Add section to config topic: parameters controlled by Kafka Streams (#8268) KAFKA-9573: Fix JVM options to run early versions of Kafka on the latest JVMs (#8138) KAFKA-9758: Doc changes for KIP-523 and KIP-527 (#8343) KAFKA-9752; New member timeout can leave group rebalance stuck (#8339) HOTFIX: fix log message in version probing system test (#8341) KAFKA-9700: Fix negative estimatedCompressionRatio (#8285)