You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by bb...@apache.org on 2020/10/08 19:16:07 UTC
[kafka] 29/31: Merge remote-tracking branch 'ak/trunk' into
rshekhar.merge.0922
This is an automated email from the ASF dual-hosted git repository.
bbejeck pushed a commit to branch Merge_AK_to_CCS_10_08_2020
in repository https://gitbox.apache.org/repos/asf/kafka.git
commit 38f4ea1466e2542e960d4e8d54ab570eee23e26a
Merge: b9f0d2b b7c8490
Author: Rohit Shekhar <rs...@confluent.io>
AuthorDate: Tue Sep 22 18:18:18 2020 -0700
Merge remote-tracking branch 'ak/trunk' into rshekhar.merge.0922
.gitignore | 1 +
README.md | 2 +-
build.gradle | 76 +
checkstyle/import-control.xml | 14 +
checkstyle/suppressions.xml | 10 +-
.../org/apache/kafka/clients/NodeApiVersions.java | 4 +-
.../kafka/clients/admin/AdminClientConfig.java | 2 +-
.../kafka/clients/consumer/ConsumerConfig.java | 2 +-
.../kafka/clients/producer/ProducerConfig.java | 2 +-
.../org/apache/kafka/common/config/ConfigDef.java | 4 +-
.../errors/InconsistentVoterSetException.java | 31 +
.../common/header/internals/RecordHeader.java | 18 +-
.../org/apache/kafka/common/protocol/ApiKeys.java | 65 +-
.../org/apache/kafka/common/protocol/Errors.java | 33 +-
.../org/apache/kafka/common/protocol/Protocol.java | 2 +-
.../kafka/common/record/ControlRecordType.java | 7 +
.../kafka/common/record/ControlRecordUtils.java | 44 +
.../apache/kafka/common/record/DefaultRecord.java | 5 +-
.../apache/kafka/common/record/MemoryRecords.java | 27 +-
.../kafka/common/record/MemoryRecordsBuilder.java | 38 +
.../apache/kafka/common/record/SimpleRecord.java | 4 +
.../kafka/common/requests/AbstractRequest.java | 6 +
.../kafka/common/requests/AbstractResponse.java | 8 +
.../kafka/common/requests/ApiVersionsResponse.java | 3 +-
.../common/requests/BeginQuorumEpochRequest.java | 94 +
.../common/requests/BeginQuorumEpochResponse.java | 108 +
.../common/requests/DescribeQuorumRequest.java | 109 +
.../common/requests/DescribeQuorumResponse.java | 98 +
.../common/requests/EndQuorumEpochRequest.java | 101 +
.../common/requests/EndQuorumEpochResponse.java | 107 +
.../apache/kafka/common/requests/VoteRequest.java | 105 +
.../apache/kafka/common/requests/VoteResponse.java | 105 +
.../common/security/kerberos/KerberosLogin.java | 2 +
.../java/org/apache/kafka/common/utils/Time.java | 4 +-
.../java/org/apache/kafka/common/utils/Timer.java | 26 +
.../java/org/apache/kafka/common/utils/Utils.java | 4 +
.../common/message/BeginQuorumEpochRequest.json | 39 +
.../common/message/BeginQuorumEpochResponse.json | 40 +
.../common/message/DescribeQuorumRequest.json | 35 +
.../common/message/DescribeQuorumResponse.json | 51 +
.../common/message/EndQuorumEpochRequest.json | 43 +
.../common/message/EndQuorumEpochResponse.json | 40 +
.../common/message/LeaderChangeMessage.json | 32 +
.../main/resources/common/message/VoteRequest.json | 46 +
.../resources/common/message/VoteResponse.json | 45 +
.../org/apache/kafka/clients/ClientUtilsTest.java | 10 +-
.../kafka/clients/ClusterConnectionStatesTest.java | 9 +-
.../java/org/apache/kafka/clients/MockClient.java | 1 +
.../apache/kafka/clients/NodeApiVersionsTest.java | 9 +-
.../common/message/SimpleExampleMessageTest.java | 28 +-
.../common/record/ControlRecordUtilsTest.java | 65 +
.../kafka/common/record/DefaultRecordTest.java | 2 +-
.../common/record/MemoryRecordsBuilderTest.java | 50 +-
.../kafka/common/record/MemoryRecordsTest.java | 41 +
.../common/requests/ApiVersionsResponseTest.java | 8 +-
.../kafka/common/requests/RequestContextTest.java | 2 +-
.../apache/kafka/common/utils/MockScheduler.java | 4 +-
.../org/apache/kafka/common/utils/MockTime.java | 14 +-
.../org/apache/kafka/common/utils/TimerTest.java | 24 +
.../common/message/SimpleExampleMessage.json | 8 +
.../kafka/connect/runtime/SinkConnectorConfig.java | 2 +-
.../connect/runtime/SourceConnectorConfig.java | 2 +-
.../runtime/distributed/DistributedConfig.java | 2 +-
.../kafka/admin/BrokerApiVersionsCommand.scala | 3 +-
.../src/main/scala/kafka/admin/ConfigCommand.scala | 2 +-
.../scala/kafka/admin/ConsumerGroupCommand.scala | 3 +-
.../scala/kafka/admin/LeaderElectionCommand.scala | 3 +-
.../PreferredReplicaLeaderElectionCommand.scala | 5 +-
.../kafka/admin/ReassignPartitionsCommand.scala | 3 +-
.../scala/kafka/admin/ZkSecurityMigrator.scala | 3 +-
.../controller/ControllerChannelManager.scala | 13 +-
.../scala/kafka/controller/ControllerContext.scala | 3 +-
.../scala/kafka/controller/KafkaController.scala | 11 +-
.../kafka/controller/PartitionStateMachine.scala | 5 +-
.../kafka/controller/ReplicaStateMachine.scala | 5 +-
.../kafka/coordinator/group/GroupCoordinator.scala | 2 +-
.../kafka/coordinator/group/GroupMetadata.scala | 7 +-
.../coordinator/group/GroupMetadataManager.scala | 31 +-
.../TransactionMarkerChannelManager.scala | 3 +-
.../transaction/TransactionStateManager.scala | 3 +-
core/src/main/scala/kafka/log/Log.scala | 19 +-
core/src/main/scala/kafka/log/LogConfig.scala | 2 +-
core/src/main/scala/kafka/log/LogValidator.scala | 2 +-
.../main/scala/kafka/network/RequestChannel.scala | 5 +-
.../main/scala/kafka/network/SocketServer.scala | 15 +-
.../scala/kafka/raft/KafkaFuturePurgatory.scala | 122 +
.../main/scala/kafka/raft/KafkaMetadataLog.scala | 138 ++
.../scala/kafka/raft/KafkaNetworkChannel.scala | 237 ++
.../main/scala/kafka/raft/SegmentPosition.scala | 23 +
.../kafka/security/authorizer/AclAuthorizer.scala | 69 +-
.../kafka/server/AbstractFetcherManager.scala | 3 +-
.../scala/kafka/server/AbstractFetcherThread.scala | 7 +-
.../src/main/scala/kafka/server/AdminManager.scala | 5 +-
.../main/scala/kafka/server/ConfigHandler.scala | 3 +-
.../scala/kafka/server/DelayedDeleteRecords.scala | 7 +-
.../main/scala/kafka/server/DelayedProduce.scala | 7 +-
.../scala/kafka/server/DynamicBrokerConfig.scala | 13 +-
core/src/main/scala/kafka/server/KafkaApis.scala | 45 +-
core/src/main/scala/kafka/server/KafkaConfig.scala | 3 +-
.../scala/kafka/server/KafkaRequestHandler.scala | 8 +-
.../main/scala/kafka/server/MetadataCache.scala | 3 +-
.../scala/kafka/server/RaftRequestHandler.scala | 179 ++
.../scala/kafka/server/ReplicaFetcherThread.scala | 3 +-
.../main/scala/kafka/server/ReplicaManager.scala | 13 +-
.../kafka/server/epoch/LeaderEpochFileCache.scala | 6 +
.../main/scala/kafka/tools/ConsoleConsumer.scala | 6 +-
.../main/scala/kafka/tools/DumpLogSegments.scala | 5 +-
.../main/scala/kafka/tools/GetOffsetShell.scala | 2 +-
.../main/scala/kafka/tools/TestRaftServer.scala | 404 ++++
core/src/main/scala/kafka/utils/Implicits.scala | 18 +
core/src/main/scala/kafka/zk/AdminZkClient.scala | 3 +-
.../kafka/admin/BrokerApiVersionsCommandTest.scala | 7 +-
.../kafka/api/PlaintextAdminIntegrationTest.scala | 3 +
.../kafka/api/TransactionsBounceTest.scala | 2 +-
.../group/GroupMetadataManagerTest.scala | 41 +-
.../test/scala/unit/kafka/log/LogConfigTest.scala | 6 +-
.../unit/kafka/network/SocketServerTest.scala | 30 +-
.../unit/kafka/raft/KafkaFuturePurgatoryTest.scala | 122 +
.../unit/kafka/raft/KafkaNetworkChannelTest.scala | 241 ++
.../server/AbstractApiVersionsRequestTest.scala | 2 +-
.../scala/unit/kafka/server/RequestQuotaTest.scala | 23 +-
.../server/epoch/LeaderEpochFileCacheTest.scala | 17 +
docs/streams/developer-guide/config-streams.html | 10 +-
.../java/org/apache/kafka/message/FieldType.java | 4 +
.../apache/kafka/message/MessageDataGenerator.java | 4 +-
.../org/apache/kafka/message/SchemaGenerator.java | 12 +-
.../org/apache/kafka/message/StructRegistry.java | 26 +-
gradle/dependencies.gradle | 2 +-
gradle/spotbugs-exclude.xml | 6 +
...enchmark.java => BaseRecordBatchBenchmark.java} | 131 +-
.../CompressedRecordBatchValidationBenchmark.java | 64 +
.../jmh/record/RecordBatchIterationBenchmark.java | 120 +-
...UncompressedRecordBatchValidationBenchmark.java | 53 +
raft/README.md | 73 +
raft/bin/test-raft-server-start.sh | 44 +
raft/config/raft-log4j.properties | 23 +
raft/config/raft.properties | 22 +
.../main/java/org/apache/kafka/raft/AckMode.java | 27 +
.../java/org/apache/kafka/raft/CandidateState.java | 252 ++
.../java/org/apache/kafka/raft/ElectionState.java | 125 +
.../java/org/apache/kafka/raft/EpochState.java | 42 +
.../org/apache/kafka/raft/FileBasedStateStore.java | 170 ++
.../java/org/apache/kafka/raft/FollowerState.java | 127 +
.../org/apache/kafka/raft/FuturePurgatory.java | 76 +
.../main/java/org/apache/kafka/raft/Isolation.java | 22 +
.../org/apache/kafka/raft/KafkaRaftClient.java | 1784 ++++++++++++++
.../java/org/apache/kafka/raft/LeaderAndEpoch.java | 44 +
.../java/org/apache/kafka/raft/LeaderState.java | 301 +++
.../java/org/apache/kafka/raft/LogAppendInfo.java | 31 +
.../java/org/apache/kafka/raft/LogFetchInfo.java | 33 +
.../org/apache/kafka/raft/LogOffsetMetadata.java | 60 +
.../apache/kafka/raft/LogTruncationException.java | 26 +
.../java/org/apache/kafka/raft/NetworkChannel.java | 63 +
.../java/org/apache/kafka/raft/OffsetAndEpoch.java | 60 +
.../java/org/apache/kafka/raft/OffsetMetadata.java | 21 +
.../java/org/apache/kafka/raft/QuorumState.java | 443 ++++
.../org/apache/kafka/raft/QuorumStateStore.java | 52 +
.../java/org/apache/kafka/raft/RaftClient.java | 79 +
.../java/org/apache/kafka/raft/RaftConfig.java | 210 ++
.../java/org/apache/kafka/raft/RaftMessage.java | 26 +
.../java/org/apache/kafka/raft/RaftRequest.java | 83 +
.../java/org/apache/kafka/raft/RaftResponse.java | 75 +
.../main/java/org/apache/kafka/raft/RaftUtil.java | 157 ++
.../org/apache/kafka/raft/ReplicatedCounter.java | 132 ++
.../java/org/apache/kafka/raft/ReplicatedLog.java | 133 ++
.../java/org/apache/kafka/raft/RequestManager.java | 210 ++
.../org/apache/kafka/raft/UnattachedState.java | 91 +
.../java/org/apache/kafka/raft/VotedState.java | 99 +
.../kafka/raft/internals/KafkaRaftMetrics.java | 204 ++
.../org/apache/kafka/raft/internals/LogOffset.java | 48 +
...che.kafka.common.config.provider.ConfigProvider | 16 +
.../main/resources/common/message/QuorumState.json | 34 +
.../org/apache/kafka/raft/CandidateStateTest.java | 165 ++
.../apache/kafka/raft/FileBasedStateStoreTest.java | 99 +
.../org/apache/kafka/raft/FollowerStateTest.java | 82 +
.../org/apache/kafka/raft/KafkaRaftClientTest.java | 2456 ++++++++++++++++++++
.../org/apache/kafka/raft/LeaderStateTest.java | 228 ++
.../org/apache/kafka/raft/MockFuturePurgatory.java | 117 +
.../apache/kafka/raft/MockFuturePurgatoryTest.java | 95 +
.../test/java/org/apache/kafka/raft/MockLog.java | 445 ++++
.../java/org/apache/kafka/raft/MockLogTest.java | 421 ++++
.../org/apache/kafka/raft/MockNetworkChannel.java | 123 +
.../apache/kafka/raft/MockQuorumStateStore.java | 36 +
.../org/apache/kafka/raft/QuorumStateTest.java | 942 ++++++++
.../java/org/apache/kafka/raft/RaftConfigTest.java | 77 +
.../apache/kafka/raft/RaftEventSimulationTest.java | 1122 +++++++++
.../org/apache/kafka/raft/RequestManagerTest.java | 138 ++
.../java/org/apache/kafka/raft/VotedStateTest.java | 28 +
.../kafka/raft/internals/KafkaRaftMetricsTest.java | 263 +++
raft/src/test/resources/log4j.properties | 21 +
settings.gradle | 1 +
.../org/apache/kafka/streams/StreamsConfig.java | 2 +-
.../processor/internals/StateDirectory.java | 94 +-
.../streams/processor/internals/StreamThread.java | 1 -
.../internals/StreamsPartitionAssignor.java | 3 +-
.../internals/assignment/ClientState.java | 10 +-
.../kafka/streams/state/ReadOnlyWindowStore.java | 5 +
.../processor/internals/StateDirectoryTest.java | 37 +
.../internals/StreamsAssignmentScaleTest.java | 256 ++
.../internals/StreamsPartitionAssignorTest.java | 75 +-
.../internals/assignment/AssignmentTestUtils.java | 64 +-
.../kafka/test/MockInternalTopicManager.java | 3 +-
202 files changed, 16665 insertions(+), 591 deletions(-)