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 4632b17272efc16606dbd20e73428034760625a6
Merge: cd74e9f 3993041
Author: Colin P. McCabe <cmcc...@apache.org>
AuthorDate: Wed Jul 29 08:37:52 2020 -0700

    Merge remote-tracking branch 'apache/trunk'

 LICENSE                                            | 403 +++++++++++-----
 README.md                                          |   4 +
 build.gradle                                       |  25 +-
 .../apache/kafka/clients/CommonClientConfigs.java  |   9 +-
 .../kafka/clients/admin/AdminClientConfig.java     |   6 +
 .../clients/admin/CreatePartitionsOptions.java     |  18 +-
 .../kafka/clients/admin/CreateTopicsOptions.java   |  16 +
 .../kafka/clients/admin/DeleteTopicsOptions.java   |  16 +
 .../kafka/clients/admin/KafkaAdminClient.java      | 293 +++++++-----
 .../org/apache/kafka/clients/admin/NewTopic.java   |  12 +-
 .../consumer/internals/ConsumerCoordinator.java    |  10 +
 .../kafka/clients/producer/KafkaProducer.java      |   1 +
 .../kafka/clients/producer/ProducerConfig.java     |  13 +-
 .../errors/NotLeaderForPartitionException.java     |   2 +-
 ....java => ThrottlingQuotaExceededException.java} |  25 +-
 .../org/apache/kafka/common/metrics/Sensor.java    |  10 +-
 .../org/apache/kafka/common/protocol/Errors.java   |   4 +-
 .../org/apache/kafka/common/requests/ApiError.java |   5 +
 .../common/security/auth/SslEngineFactory.java     |  49 +-
 .../apache/kafka/server/quota/ClientQuotaType.java |   3 +-
 .../common/message/CreatePartitionsRequest.json    |   8 +-
 .../common/message/CreatePartitionsResponse.json   |   6 +-
 .../common/message/CreateTopicsRequest.json        |   5 +-
 .../common/message/CreateTopicsResponse.json       |   5 +-
 .../common/message/DeleteTopicsRequest.json        |   5 +-
 .../common/message/DeleteTopicsResponse.json       |   9 +-
 .../kafka/clients/admin/KafkaAdminClientTest.java  | 526 +++++++++++++++++++--
 .../clients/consumer/RoundRobinAssignorTest.java   |   2 +-
 .../kafka/clients/producer/KafkaProducerTest.java  |   1 +
 .../kafka/common/requests/RequestResponseTest.java | 108 ++---
 .../connect/storage/KafkaStatusBackingStore.java   |   1 +
 core/src/main/scala/kafka/cluster/Partition.scala  |  11 +-
 .../kafka/server/AbstractFetcherManager.scala      |   4 +-
 .../src/main/scala/kafka/server/AdminManager.scala | 211 +++++----
 .../scala/kafka/server/ClientQuotaManager.scala    | 226 +++++----
 .../kafka/server/ClientRequestQuotaManager.scala   |  37 +-
 .../main/scala/kafka/server/ConfigHandler.scala    |   6 +
 .../server/ControllerMutationQuotaManager.scala    | 242 ++++++++++
 .../kafka/server/DelayedCreatePartitions.scala     |  14 +
 .../scala/kafka/server/DelayedDeleteTopics.scala   |   6 +
 .../scala/kafka/server/DynamicBrokerConfig.scala   |   7 +-
 .../main/scala/kafka/server/DynamicConfig.scala    |  41 +-
 core/src/main/scala/kafka/server/KafkaApis.scala   |  73 ++-
 core/src/main/scala/kafka/server/KafkaConfig.scala |  15 +-
 .../main/scala/kafka/server/MetadataCache.scala    |   4 +
 .../src/main/scala/kafka/server/QuotaFactory.scala |  28 +-
 .../main/scala/kafka/tools/ConsoleProducer.scala   |   4 +-
 .../scala/kafka/tools/ConsumerPerformance.scala    |   8 +-
 core/src/main/scala/kafka/utils/Pool.scala         |   2 +
 core/src/main/scala/kafka/zk/AdminZkClient.scala   | 107 ++++-
 .../kafka/api/AuthorizerIntegrationTest.scala      |   2 +-
 .../kafka/api/PlaintextConsumerTest.scala          |   8 +-
 .../server/DynamicBrokerReconfigurationTest.scala  |  25 +-
 .../kafka/admin/ConsumerGroupCommandTest.scala     |   2 +
 .../admin/TopicCommandWithAdminClientTest.scala    |  19 +-
 .../unit/kafka/cluster/PartitionLockTest.scala     |  51 ++
 .../kafka/server/BaseClientQuotaManagerTest.scala  |  92 ++++
 .../unit/kafka/server/ClientQuotaManagerTest.scala | 367 +++++---------
 .../server/ClientRequestQuotaManagerTest.scala     |  89 ++++
 .../ControllerMutationQuotaManagerTest.scala       | 216 +++++++++
 .../kafka/server/ControllerMutationQuotaTest.scala | 366 ++++++++++++++
 .../scala/unit/kafka/server/KafkaApisTest.scala    |   3 +-
 .../unit/kafka/server/LogDirFailureTest.scala      |   3 +
 .../scala/unit/kafka/server/RequestQuotaTest.scala |  16 +-
 .../unit/kafka/tools/ConsumerPerformanceTest.scala |  14 +-
 .../src/test/scala/unit/kafka/utils/PoolTest.scala |  36 +-
 .../test/scala/unit/kafka/utils/TestUtils.scala    |   8 +-
 docs/ops.html                                      |  14 +-
 docs/streams/upgrade-guide.html                    |   8 +
 docs/upgrade.html                                  |  10 +
 gradle/dependencies.gradle                         |  30 +-
 .../jmh/metadata/MetadataRequestBenchmark.java     |   6 +-
 .../apache/kafka/jmh/server/CheckpointBench.java   |   3 +-
 .../kafka/log4jappender/KafkaLog4jAppender.java    |   1 +
 release.py                                         |  38 +-
 .../org/apache/kafka/streams/StreamsConfig.java    |  25 +-
 .../streams/errors/InvalidStateStoreException.java |   9 +-
 .../InvalidStateStorePartitionException.java       |  26 +-
 .../errors/StateStoreMigratedException.java        |  27 +-
 .../errors/StateStoreNotAvailableException.java    |  25 +-
 .../streams/errors/StreamsNotStartedException.java |  27 +-
 .../errors/StreamsRebalancingException.java        |  25 +-
 .../streams/errors/UnknownStateStoreException.java |  23 +-
 .../kafka/streams/kstream/KGroupedStream.java      |   4 +-
 .../kstream/internals/KGroupedStreamImpl.java      |   4 +-
 .../internals/AbstractProcessorContext.java        |   2 +-
 .../processor/internals/GlobalStateMaintainer.java |   2 +-
 .../internals/GlobalStateManagerImpl.java          |  30 +-
 .../processor/internals/GlobalStateUpdateTask.java |  24 +-
 .../processor/internals/GlobalStreamThread.java    |  64 ++-
 .../processor/internals/InternalTopicManager.java  |   1 +
 .../state/internals/InMemorySessionStore.java      |  23 +-
 .../apache/kafka/streams/StreamsConfigTest.java    |  26 +-
 .../integration/AbstractResetIntegrationTest.java  |   7 +-
 .../integration/InternalTopicIntegrationTest.java  |   7 +-
 ...bleForeignKeyInnerJoinMultiIntegrationTest.java |   8 +-
 .../internals/AbstractProcessorContextTest.java    |   6 +
 .../internals/GlobalStateManagerImplTest.java      |  28 +-
 .../processor/internals/GlobalStateTaskTest.java   |  28 +-
 .../internals/GlobalStreamThreadTest.java          |  46 +-
 .../internals/InternalTopicManagerTest.java        |   1 +
 .../processor/internals/StateConsumerTest.java     |  13 +-
 .../tests/StreamsBrokerDownResilienceTest.java     |   6 +-
 .../kafka/streams/tests/StreamsOptimizedTest.java  |   2 +-
 .../streams/tests/StreamsStandByReplicaTest.java   |   2 +
 .../apache/kafka/test/GlobalStateManagerStub.java  |  10 +-
 .../apache/kafka/streams/scala/WordCountTest.scala |   1 -
 ...StreamToTableJoinScalaIntegrationTestBase.scala |   2 -
 .../apache/kafka/streams/TopologyTestDriver.java   |   6 +-
 .../tests/core/group_mode_transactions_test.py     |  13 +-
 tests/kafkatest/tests/core/transactions_test.py    |  20 +-
 tests/kafkatest/tests/streams/base_streams_test.py |   3 +-
 .../org/apache/kafka/tools/VerifiableProducer.java |   1 +
 113 files changed, 3376 insertions(+), 1274 deletions(-)


Reply via email to