Merge branch 'confluentinc-kafka-june-15'
Conflicts: Unmerged paths: (use "git add/rm <file>..." as appropriate to mark resolution) both modified: build.gradle both modified: checkstyle/import-control.xml both modified: checkstyle/suppressions.xml both modified: clients/src/main/java/org/apache/kafka/clients/admin/KafkaAdminClient.java both modified: clients/src/main/java/org/apache/kafka/common/internals/Topic.java both modified: clients/src/main/java/org/apache/kafka/common/protocol/Errors.java both modified: clients/src/test/java/org/apache/kafka/clients/admin/KafkaAdminClientTest.java both modified: clients/src/test/java/org/apache/kafka/common/network/NetworkTestUtils.java both modified: clients/src/test/java/org/apache/kafka/common/network/SelectorTest.java both modified: clients/src/test/java/org/apache/kafka/common/network/SslSelectorTest.java both modified: clients/src/test/java/org/apache/kafka/common/security/authenticator/SaslServerAuthenticatorTest.java both modified: core/src/main/scala/kafka/cluster/Partition.scala both modified: core/src/main/scala/kafka/controller/KafkaController.scala both modified: core/src/main/scala/kafka/server/AlterPartitionManager.scala both modified: core/src/main/scala/kafka/server/ControllerApis.scala both modified: core/src/main/scala/kafka/server/ReplicaManager.scala both modified: core/src/test/scala/unit/kafka/cluster/PartitionLockTest.scala both modified: core/src/test/scala/unit/kafka/cluster/PartitionTest.scala both modified: core/src/test/scala/unit/kafka/controller/ControllerIntegrationTest.scala both modified: core/src/test/scala/unit/kafka/integration/KafkaServerTestHarness.scala both modified: core/src/test/scala/unit/kafka/server/AlterPartitionManagerTest.scala both modified: core/src/test/scala/unit/kafka/server/ControllerApisTest.scala both modified: core/src/test/scala/unit/kafka/server/MetadataCacheTest.scala both modified: core/src/test/scala/unit/kafka/utils/TestUtils.scala both modified: core/src/main/scala/kafka/server/AbstractFetcherManager.scala both modified: core/src/main/scala/kafka/server/AbstractFetcherThread.scala added by them: core/src/main/scala/kafka/server/BrokerBlockingSender.scala both modified: core/src/main/scala/kafka/server/BrokerFeatures.scala both modified: core/src/main/scala/kafka/server/KafkaConfig.scala both modified: core/src/main/scala/kafka/server/KafkaRaftServer.scala both added: core/src/main/scala/kafka/server/LeaderEndPoint.scala both added: core/src/main/scala/kafka/server/LocalLeaderEndPoint.scala both added: core/src/main/scala/kafka/server/RemoteLeaderEndPoint.scala both modified: core/src/main/scala/kafka/server/ReplicaAlterLogDirsManager.scala both modified: core/src/main/scala/kafka/server/ReplicaAlterLogDirsThread.scala both modified: core/src/main/scala/kafka/server/ReplicaFetcherManager.scala both modified: core/src/main/scala/kafka/server/ReplicaFetcherThread.scala both modified: core/src/main/scala/kafka/server/metadata/BrokerMetadataPublisher.scala both modified: core/src/main/scala/kafka/tools/StorageTool.scala both modified: core/src/test/java/kafka/test/junit/RaftClusterInvocationContext.java both modified: core/src/test/scala/integration/kafka/admin/ReassignPartitionsIntegrationTest.scala both modified: core/src/test/scala/integration/kafka/server/MetadataVersionIntegrationTest.scala both modified: core/src/test/scala/unit/kafka/log/LogTestUtils.scala both modified: core/src/test/scala/unit/kafka/log/ProducerStateManagerTest.scala deleted by us: core/src/test/scala/unit/kafka/log/UnifiedLogTest.scala both modified: core/src/test/scala/unit/kafka/server/AbstractFetcherManagerTest.scala both modified: core/src/test/scala/unit/kafka/server/AbstractFetcherThreadTest.scala both modified: core/src/test/scala/unit/kafka/server/LogOffsetTest.scala both modified: core/src/test/scala/unit/kafka/server/ReplicaAlterLogDirsThreadTest.scala both modified: core/src/test/scala/unit/kafka/server/ReplicaFetcherThreadTest.scala both modified: core/src/test/scala/unit/kafka/server/ReplicaManagerConcurrencyTest.scala both modified: core/src/test/scala/unit/kafka/server/ReplicaManagerTest.scala both modified: core/src/test/scala/unit/kafka/server/epoch/LeaderEpochIntegrationTest.scala both modified: core/src/test/scala/unit/kafka/server/metadata/BrokerMetadataListenerTest.scala both modified: core/src/test/scala/unit/kafka/tools/StorageToolTest.scala both modified: docs/upgrade.html both modified: gradle.properties both modified: gradle/dependencies.gradle both modified: jmh-benchmarks/src/main/java/org/apache/kafka/jmh/fetcher/ReplicaFetcherThreadBenchmark.java both modified: metadata/src/main/java/org/apache/kafka/controller/BootstrapMetadata.java both modified: metadata/src/main/java/org/apache/kafka/controller/ClusterControlManager.java both modified: metadata/src/main/java/org/apache/kafka/controller/ControllerRequestContext.java both modified: metadata/src/main/java/org/apache/kafka/controller/FeatureControlManager.java both modified: metadata/src/main/java/org/apache/kafka/controller/QuorumController.java both modified: metadata/src/main/java/org/apache/kafka/controller/QuorumFeatures.java both modified: metadata/src/main/java/org/apache/kafka/controller/ReplicationControlManager.java both modified: metadata/src/main/java/org/apache/kafka/image/FeaturesImage.java both modified: metadata/src/main/java/org/apache/kafka/image/MetadataImage.java both modified: metadata/src/test/java/org/apache/kafka/controller/ClusterControlManagerTest.java both modified: metadata/src/test/java/org/apache/kafka/controller/FeatureControlManagerTest.java both modified: metadata/src/test/java/org/apache/kafka/controller/QuorumControllerTest.java both modified: metadata/src/test/java/org/apache/kafka/controller/QuorumControllerTestEnv.java both modified: metadata/src/test/java/org/apache/kafka/controller/ReplicationControlManagerTest.java both modified: server-common/src/main/java/org/apache/kafka/server/common/MetadataVersion.java both modified: server-common/src/test/java/org/apache/kafka/server/common/MetadataVersionTest.java both modified: tests/kafkatest/services/kafka/kafka.py -- both modified: connect/runtime/src/main/java/org/apache/kafka/connect/runtime/Worker.java both modified: connect/runtime/src/main/java/org/apache/kafka/connect/runtime/WorkerConnector.java both modified: connect/runtime/src/main/java/org/apache/kafka/connect/runtime/WorkerSourceTask.java both modified: connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/DistributedHerder.java both modified: connect/runtime/src/main/java/org/apache/kafka/connect/storage/KafkaConfigBackingStore.java both modified: connect/runtime/src/test/java/org/apache/kafka/connect/runtime/AbstractHerderTest.java both modified: connect/runtime/src/test/java/org/apache/kafka/connect/runtime/WorkerConnectorTest.java both modified: connect/runtime/src/test/java/org/apache/kafka/connect/runtime/WorkerSourceTaskTest.java both modified: connect/runtime/src/test/java/org/apache/kafka/connect/runtime/WorkerTest.java both modified: connect/runtime/src/test/java/org/apache/kafka/connect/runtime/distributed/DistributedHerderTest.java As for the connect files, we had a lot of messy conflicts so what was done was rm -rf ./connect/* and copy the folder recursively from the latest ce-kafka/master. The reason is that the big commits causing this (KAFKA-10000) were not skipped as part of the merge, and they will be cherry-picked separately from another PR, so we rely on that. Any other connect commits that were inadvertently deleted through this will be cherry-picked again The next three commit messages here are the commits from connect I had to cherry-pick: KAFKA-13780: Generate OpenAPI file for Connect REST API (#12067) New gradle task `connect:runtime:genConnectOpenAPIDocs` that generates `connect_rest.yaml` under `docs/generated`. This task is executed when `siteDocsTar` runs. KAFKA-13846: Adding overloaded metricOrElseCreate method (#12121) Reviewers: David Jacot <djacot@confluent.io>, Justine Olshan <jolshan@confluent.io>, Guozhang Wang <wangguoz@gmail.com> KAFKA-13846: Use the new addMetricsIfAbsent API (#12287) Use the newly added function to replace the old addMetric function that may throw illegal argument exceptions. Although in some cases concurrency should not be possible they do not necessarily remain always true in the future, so it's better to use the new API just to be less error-prone. Reviewers: Bruno Cadonna <cadonna@apache.org> And these are the extra commits I did to fix failing tests/conflicts from the merge: MINOR: Adapt ReassignPartitionsIntegrationTest to account for static default values of throttles Import mockitoInline for clients test package and fix proxy selector unit test Fix SaslServerAuthenticatorTest - make map modifiable (proxy protocol adds to it) and pass down max receive bytes for mechanism being tested Disable testNoCleanShutdownAfterFailedStartupDueToCorruptLogs due to CPKAFKA-8947 consistent with master Re-align ReassignPartitionsIntegrationTest with ce-kafka/master Fix failing BrokerInterceptor unit test due to MockitoInline import
显示
- build.gradle 29 个添加, 3 个删除build.gradle
- checkstyle/import-control.xml 1 个添加, 0 个删除checkstyle/import-control.xml
- checkstyle/suppressions.xml 3 个添加, 3 个删除checkstyle/suppressions.xml
- clients/src/main/java/org/apache/kafka/clients/admin/KafkaAdminClient.java 5 个添加, 1 个删除...java/org/apache/kafka/clients/admin/KafkaAdminClient.java
- clients/src/main/java/org/apache/kafka/clients/admin/LogDirDescription.java 28 个添加, 0 个删除...ava/org/apache/kafka/clients/admin/LogDirDescription.java
- clients/src/main/java/org/apache/kafka/clients/consumer/internals/AbstractCoordinator.java 5 个添加, 3 个删除...kafka/clients/consumer/internals/AbstractCoordinator.java
- clients/src/main/java/org/apache/kafka/clients/consumer/internals/Fetcher.java 5 个添加, 6 个删除.../org/apache/kafka/clients/consumer/internals/Fetcher.java
- clients/src/main/java/org/apache/kafka/clients/producer/KafkaProducer.java 6 个添加, 2 个删除...java/org/apache/kafka/clients/producer/KafkaProducer.java
- clients/src/main/java/org/apache/kafka/common/compress/KafkaLZ4BlockInputStream.java 1 个添加, 1 个删除...pache/kafka/common/compress/KafkaLZ4BlockInputStream.java
- clients/src/main/java/org/apache/kafka/common/config/TopicConfig.java 7 个添加, 5 个删除...main/java/org/apache/kafka/common/config/TopicConfig.java
- clients/src/main/java/org/apache/kafka/common/metrics/Metrics.java 36 个添加, 4 个删除...rc/main/java/org/apache/kafka/common/metrics/Metrics.java
- clients/src/main/java/org/apache/kafka/common/metrics/Sensor.java 8 个添加, 2 个删除...src/main/java/org/apache/kafka/common/metrics/Sensor.java
- clients/src/main/java/org/apache/kafka/common/record/LazyDownConversionRecordsSend.java 1 个添加, 1 个删除...he/kafka/common/record/LazyDownConversionRecordsSend.java
- clients/src/main/java/org/apache/kafka/common/record/MemoryRecordsBuilder.java 0 个添加, 2 个删除.../org/apache/kafka/common/record/MemoryRecordsBuilder.java
- clients/src/main/java/org/apache/kafka/common/requests/DescribeLogDirsResponse.java 1 个添加, 0 个删除...apache/kafka/common/requests/DescribeLogDirsResponse.java
- clients/src/main/java/org/apache/kafka/common/security/authenticator/SaslServerAuthenticator.java 14 个添加, 18 个删除...ommon/security/authenticator/SaslServerAuthenticator.java
- clients/src/main/java/org/apache/kafka/common/security/oauthbearer/secured/Retry.java 4 个添加, 4 个删除...ache/kafka/common/security/oauthbearer/secured/Retry.java
- clients/src/main/resources/common/message/DescribeLogDirsRequest.json 2 个添加, 1 个删除...main/resources/common/message/DescribeLogDirsRequest.json
- clients/src/main/resources/common/message/DescribeLogDirsResponse.json 9 个添加, 2 个删除...ain/resources/common/message/DescribeLogDirsResponse.json
- clients/src/test/java/org/apache/kafka/clients/admin/KafkaAdminClientTest.java 211 个添加, 138 个删除.../org/apache/kafka/clients/admin/KafkaAdminClientTest.java
加载中
想要评论请 注册 或 登录