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 bcb9f6a1a1b8d044335d3e5baffd8b807c83741d Merge: e5d9b92 f4944ee Author: David Mao <d...@confluent.io> AuthorDate: Mon Jul 20 13:08:09 2020 -0500 Merge branch 'trunk' of github.com:apache/kafka into trunk-sync-20-july .../kafka/clients/consumer/internals/Fetcher.java | 4 +- .../internals/OffsetsForLeaderEpochClient.java | 2 +- .../kafka/clients/producer/MockProducer.java | 2 +- .../errors/NotLeaderForPartitionException.java | 4 +- ...tion.java => NotLeaderOrFollowerException.java} | 18 +- .../errors/ReplicaNotAvailableException.java | 8 +- .../org/apache/kafka/common/protocol/Errors.java | 10 +- .../common/requests/AlterClientQuotasResponse.java | 13 +- .../org/apache/kafka/common/requests/ApiError.java | 5 +- .../common/requests/DeleteRecordsResponse.java | 2 +- .../requests/DescribeClientQuotasResponse.java | 11 +- .../apache/kafka/common/requests/FetchRequest.java | 2 +- .../kafka/common/requests/FetchResponse.java | 10 +- .../kafka/common/requests/ListOffsetResponse.java | 4 +- .../requests/OffsetsForLeaderEpochResponse.java | 4 +- .../kafka/common/requests/ProduceRequest.java | 2 +- .../kafka/common/requests/ProduceResponse.java | 8 +- .../common/requests/SaslAuthenticateRequest.java | 5 +- .../common/requests/WriteTxnMarkersResponse.java | 2 +- .../apache/kafka/common/security/JaasContext.java | 6 +- .../authenticator/SaslClientAuthenticator.java | 4 +- .../security/ssl/DefaultSslEngineFactory.java | 8 +- .../common/security/ssl/SslPrincipalMapper.java | 3 +- .../kafka/clients/admin/KafkaAdminClientTest.java | 12 +- .../kafka/clients/consumer/KafkaConsumerTest.java | 2 +- .../clients/consumer/internals/FetcherTest.java | 20 +-- .../clients/producer/internals/SenderTest.java | 20 +-- .../producer/internals/TransactionManagerTest.java | 12 +- .../memory/GarbageCollectedMemoryPoolTest.java | 1 + .../common/network/SslTransportLayerTest.java | 1 + .../common/requests/LeaderAndIsrResponseTest.java | 2 +- .../kafka/common/requests/RequestResponseTest.java | 200 ++++++++++++--------- .../common/requests/StopReplicaResponseTest.java | 2 +- .../ExpiringCredentialRefreshingLoginTest.java | 1 + .../src/main/scala/kafka/admin/ConfigCommand.scala | 9 + core/src/main/scala/kafka/cluster/Partition.scala | 21 +-- .../coordinator/group/GroupMetadataManager.scala | 4 +- ...TransactionMarkerRequestCompletionHandler.scala | 2 +- .../transaction/TransactionStateManager.scala | 2 +- .../scala/kafka/server/AbstractFetcherThread.scala | 4 +- .../src/main/scala/kafka/server/AdminManager.scala | 12 +- .../scala/kafka/server/DelayedDeleteRecords.scala | 2 +- .../src/main/scala/kafka/server/DelayedFetch.scala | 10 +- .../main/scala/kafka/server/DelayedProduce.scala | 2 +- .../main/scala/kafka/server/DynamicConfig.scala | 13 +- core/src/main/scala/kafka/server/KafkaApis.scala | 6 +- .../kafka/server/ReplicaAlterLogDirsThread.scala | 10 +- .../main/scala/kafka/server/ReplicaManager.scala | 56 +++--- .../kafka/api/PlaintextAdminIntegrationTest.scala | 2 +- .../kafka/api/ProducerFailureHandlingTest.scala | 2 +- .../kafka/server/DelayedFetchTest.scala | 12 +- .../scala/unit/kafka/admin/ConfigCommandTest.scala | 21 +++ .../scala/unit/kafka/cluster/PartitionTest.scala | 22 +-- .../group/GroupMetadataManagerTest.scala | 4 +- ...sactionMarkerRequestCompletionHandlerTest.scala | 4 +- .../transaction/TransactionStateManagerTest.scala | 2 +- .../kafka/server/ClientQuotasRequestTest.scala | 30 +++- .../scala/unit/kafka/server/FetchRequestTest.scala | 2 +- .../scala/unit/kafka/server/KafkaApisTest.scala | 4 +- .../unit/kafka/server/ListOffsetsRequestTest.scala | 14 +- .../unit/kafka/server/LogDirFailureTest.scala | 10 +- .../server/OffsetsForLeaderEpochRequestTest.scala | 8 +- .../unit/kafka/server/ProduceRequestTest.scala | 2 +- .../server/ReplicaAlterLogDirsThreadTest.scala | 24 +-- .../kafka/server/ReplicaFetcherThreadTest.scala | 2 +- .../kafka/server/ReplicaManagerQuotasTest.scala | 3 +- .../unit/kafka/server/ReplicaManagerTest.scala | 54 ++++-- .../server/epoch/LeaderEpochIntegrationTest.scala | 2 +- .../server/epoch/OffsetsForLeaderEpochTest.scala | 2 +- docs/upgrade.html | 4 + .../internals/StreamsPartitionAssignor.java | 51 ++++-- .../internals/assignment/ClientState.java | 121 +++++++------ .../internals/assignment/AssignmentTestUtils.java | 7 + .../internals/assignment/ClientStateTest.java | 88 +++++++-- tests/kafkatest/services/connect.py | 25 ++- .../client/client_compatibility_features_test.py | 3 +- .../client_compatibility_produce_consume_test.py | 3 +- tests/kafkatest/tests/client/consumer_test.py | 4 +- .../tests/connect/connect_distributed_test.py | 14 ++ .../core/compatibility_test_new_broker_test.py | 3 +- tests/kafkatest/tests/core/upgrade_test.py | 4 +- 81 files changed, 706 insertions(+), 410 deletions(-)