Skip to content
代码片段 群组 项目
派生自 oss-mirrors / ICV / kafka
源项目有可见性限制。
用户头像
Ismael Juma 编辑于
Conflicts and compiler errors:
* .gitignore: trivial conflicts due to support-metrics-common removal, take
upstream changes while keeping local ones.
* build.gradle: take changes to remove support-metrics-common and resolve
conflicts in the conditional disabling of -Werror for some projects.
* confluent-import-control.xml: file was deleted upstream since it was empty,
but it is still used in ce-kafka. Remove support metrics section.
* suppressions.xml: remove support metrics section.
* Partition.scala: trivial conflict in conflict due to spacing.
* PartitionTest.scala: move SlowLog to LogUtils with an adjusted name and make
it work with tiered storage.
* dependencies.gradle: take upstream changes, remove avro and httpmime.
* settings.gradle: take upstream changes, remove support-metrics-common.
* PartitionMakeFollowerBenchmark: adjust to work with tiered, followed same
approach as UpdateFollowerFetchStateBenchmark.
* KafkaZkClientTest: pass None for topic id parameter in
`zkClient.createTopicAssignment` that only exists in ce-kafka.
* AegisIntegrationTest: adjust testAegisWithoutBrokers to set
DEFAULT_API_TIMEOUT_MS_CONFIG and tweak expected
exception message.
* PlaintextAdminIntegrationTest: adjust expected message in
testElectPreferredLeaders.

A number of files in support-metrics-common and support-metrics-client
had been changed in ce-kafka. Deleted them all.

* confluent/master:
  CONFLUENT: Remove support-metrics-common (#258)
  KAFKA-9594: Add a separate lock to pause the follower log append while checking if the log dir could be replaced.
  HOTFIX: compile error in EmbeddedKafkaCluster (#8170)
  KAFKA-9602: Close the stream internal producer only in EOS (#8166)
  KAFKA-9498; Topic validation during the topic creation triggers unnecessary TopicChange events (#8062)
  MINOR: don't assign standby tasks with no logged state (#8147)
  KAFKA-8147: Add changelog topic configuration to KTable suppress (#8029)
  Revert "KAFKA-9533: ValueTransform forwards `null` values (#8108)" (#8167)
  MINOR: Consistent terminal period in Errors.defaultExceptionMessage (#3909)
e90b9017
历史
名称 最后提交 最后更新
..