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 83f1575a20c7f3815f3a839d2e51182347e06a52
Merge: 38f4ea1 2804257
Author: Ismael Juma <ism...@juma.me.uk>
AuthorDate: Thu Oct 8 11:35:51 2020 -0700
CONFLUENT: Sync from apache/kafka (8 October 2020)
* commit '2804257fe221f37e5098bd': (67 commits)
KAFKA-10562: Properly invoke new StateStoreContext init (#9388)
MINOR: trivial cleanups, javadoc errors, omitted StateStore tests, etc.
(#8130)
KAFKA-10564: only process non-empty task directories when internally
cleaning obsolete state stores (#9373)
KAFKA-9274: fix incorrect default value for `task.timeout.ms` config
(#9385)
KAFKA-10362: When resuming Streams active task with EOS, the checkpoint
file is deleted (#9247)
KAFKA-10028: Implement write path for feature versioning system (KIP-584)
(#9001)
KAFKA-10402: Upgrade system tests to python3 (#9196)
KAFKA-10186; Abort transaction with pending data with
TransactionAbortedException (#9280)
MINOR: Remove `TargetVoters` from `DescribeQuorum` (#9376)
Revert "KAFKA-10469: Resolve logger levels hierarchically (#9266)"
MINOR: Don't publish javadocs for raft module (#9336)
KAFKA-9929: fix: add missing default implementations (#9321)
KAFKA-10188: Prevent SinkTask::preCommit from being called after
SinkTask::stop (#8910)
KAFKA-10338; Support PEM format for SSL key and trust stores (KIP-651)
(#9345)
KAFKA-10527; Voters should not reinitialize as leader in same epoch
(#9348)
MINOR: Refactor unit tests around RocksDBConfigSetter (#9358)
KAFKA-6733: Printing additional ConsumerRecord fields in
DefaultMessageFormatter (#9099)
MINOR: Annotate test BlockingConnectorTest as integration test (#9379)
MINOR: Fix failing test due to KAFKA-10556 PR (#9372)
KAFKA-10439: Connect's Values to parse BigInteger as Decimal with zero
scale. (#9320)
...
bin/kafka-server-stop.sh | 2 +-
build.gradle | 7 +-
checkstyle/import-control.xml | 5 +-
checkstyle/suppressions.xml | 9 +-
.../apache/kafka/clients/CommonClientConfigs.java | 10 +-
.../java/org/apache/kafka/clients/admin/Admin.java | 68 +++
.../kafka/clients/admin/AdminClientConfig.java | 6 -
.../clients/admin/DescribeFeaturesOptions.java | 48 ++
.../clients/admin/DescribeFeaturesResult.java | 32 +-
.../kafka/clients/admin/FeatureMetadata.java | 111 ++++
.../apache/kafka/clients/admin/FeatureUpdate.java | 78 +++
.../kafka/clients/admin/FinalizedVersionRange.java | 84 +++
.../kafka/clients/admin/KafkaAdminClient.java | 326 ++++++++++--
.../kafka/clients/admin/SupportedVersionRange.java | 82 +++
.../kafka/clients/admin/UpdateFeaturesOptions.java | 20 +-
.../kafka/clients/admin/UpdateFeaturesResult.java} | 33 +-
.../kafka/clients/consumer/KafkaConsumer.java | 13 +-
.../consumer/internals/AbstractCoordinator.java | 54 +-
.../consumer/internals/ConsumerCoordinator.java | 2 +-
.../consumer/internals/ConsumerProtocol.java | 347 ++++--------
.../kafka/clients/consumer/internals/Fetcher.java | 165 +++---
.../kafka/clients/producer/KafkaProducer.java | 5 +-
.../kafka/clients/producer/MockProducer.java | 6 +
.../kafka/clients/producer/ProducerConfig.java | 13 +-
.../kafka/clients/producer/internals/Sender.java | 7 +-
.../apache/kafka/common/config/AbstractConfig.java | 7 +
.../org/apache/kafka/common/config/SslConfigs.java | 33 +-
.../errors/FeatureUpdateFailedException.java | 17 +-
.../errors/InvalidUpdateVersionException.java | 15 +-
.../common/errors/TransactionAbortedException.java | 31 +-
.../kafka/common/feature/BaseVersionRange.java | 21 +-
.../common/feature/FinalizedVersionRange.java | 4 +-
.../common/feature/SupportedVersionRange.java | 10 +-
.../kafka/common/network/SslChannelBuilder.java | 2 +
.../org/apache/kafka/common/protocol/ApiKeys.java | 15 +-
.../org/apache/kafka/common/protocol/Errors.java | 6 +-
.../kafka/common/requests/AbstractRequest.java | 5 +
.../kafka/common/requests/AbstractResponse.java | 7 +-
.../kafka/common/requests/AlterIsrRequest.java | 73 +++
.../kafka/common/requests/AlterIsrResponse.java | 58 ++
.../kafka/common/requests/ApiVersionsResponse.java | 58 +-
.../kafka/common/requests/ListOffsetRequest.java | 303 +++--------
.../kafka/common/requests/ListOffsetResponse.java | 262 ++-------
.../common/requests/UpdateFeaturesRequest.java | 95 ++++
.../common/requests/UpdateFeaturesResponse.java | 109 ++++
.../authenticator/SaslClientAuthenticator.java | 6 +-
.../authenticator/SaslServerAuthenticator.java | 5 +-
.../security/ssl/DefaultSslEngineFactory.java | 315 +++++++++--
.../java/org/apache/kafka/common/utils/Utils.java | 33 ++
.../resources/common/message/AlterIsrRequest.json | 42 ++
...beQuorumResponse.json => AlterIsrResponse.json} | 45 +-
.../common/message/ApiVersionsResponse.json | 4 +-
.../common/message/ConsumerProtocolAssignment.json | 35 ++
.../message/ConsumerProtocolSubscription.json | 36 ++
.../common/message/DeleteTopicsResponse.json | 2 +-
.../common/message/DescribeQuorumResponse.json | 1 -
.../common/message/ListOffsetRequest.json | 2 +-
.../common/message/ListOffsetResponse.json | 2 +-
.../common/message/UpdateFeaturesRequest.json | 35 ++
.../common/message/UpdateFeaturesResponse.json | 39 ++
.../kafka/clients/admin/AdminClientTestUtils.java | 57 ++
.../kafka/clients/admin/KafkaAdminClientTest.java | 460 +++++++++++++---
.../kafka/clients/admin/MockAdminClient.java | 10 +
.../kafka/clients/consumer/KafkaConsumerTest.java | 158 ++++--
.../consumer/internals/ConsumerProtocolTest.java | 61 +--
.../clients/consumer/internals/FetcherTest.java | 237 ++++++---
.../kafka/clients/producer/KafkaProducerTest.java | 28 +-
.../kafka/clients/producer/MockProducerTest.java | 10 +
.../clients/producer/internals/SenderTest.java | 26 +
.../kafka/common/config/AbstractConfigTest.java | 9 +
.../apache/kafka/common/message/MessageTest.java | 49 ++
.../apache/kafka/common/network/CertStores.java | 75 ++-
.../common/network/SslTransportLayerTest.java | 341 ++++++------
.../common/requests/ListOffsetRequestTest.java | 147 ++++++
.../kafka/common/requests/RequestResponseTest.java | 84 ++-
.../authenticator/SaslAuthenticatorTest.java | 33 +-
.../security/ssl/DefaultSslEngineFactoryTest.java | 324 ++++++++++++
.../kafka/common/security/ssl/SslFactoryTest.java | 99 +++-
.../org/apache/kafka/common/utils/UtilsTest.java | 34 ++
.../java/org/apache/kafka/test/TestSslUtils.java | 302 +++++++++--
.../java/org/apache/kafka/connect/data/Values.java | 8 +-
.../apache/kafka/connect/sink/SinkTaskContext.java | 2 +-
.../kafka/connect/source/SourceTaskContext.java | 2 +-
.../org/apache/kafka/connect/data/ValuesTest.java | 128 +++++
.../apache/kafka/connect/json/JsonConverter.java | 2 +-
.../kafka/connect/json/JsonConverterTest.java | 30 ++
.../kafka/connect/mirror/MirrorCheckpointTask.java | 2 +-
.../mirror/MirrorConnectorsIntegrationTest.java | 381 ++++++++-----
.../kafka/connect/runtime/WorkerSinkTask.java | 7 +
.../runtime/distributed/DistributedHerder.java | 13 +-
.../connect/storage/KafkaStatusBackingStore.java | 1 -
.../apache/kafka/connect/util/KafkaBasedLog.java | 15 +-
.../connect/integration/BlockingConnectorTest.java | 7 +
.../kafka/connect/runtime/WorkerSinkTaskTest.java | 50 ++
.../runtime/distributed/DistributedHerderTest.java | 9 +
.../kafka/connect/transforms/TimestampRouter.java | 2 +-
.../scala/kafka/admin/ConsumerGroupCommand.scala | 16 +-
core/src/main/scala/kafka/admin/TopicCommand.scala | 30 +-
core/src/main/scala/kafka/api/ApiVersion.scala | 9 +
core/src/main/scala/kafka/api/LeaderAndIsr.scala | 10 +
core/src/main/scala/kafka/cluster/Partition.scala | 343 ++++++++----
.../scala/kafka/controller/ControllerState.scala | 7 +-
.../scala/kafka/controller/KafkaController.scala | 587 ++++++++++++++++++++-
.../kafka/coordinator/group/GroupMetadata.scala | 2 +-
.../coordinator/group/GroupMetadataManager.scala | 14 +-
core/src/main/scala/kafka/log/Log.scala | 2 +-
core/src/main/scala/kafka/log/LogValidator.scala | 15 +-
.../main/scala/kafka/network/SocketServer.scala | 51 +-
.../main/scala/kafka/raft/KafkaMetadataLog.scala | 5 +-
.../scala/kafka/raft/KafkaNetworkChannel.scala | 2 -
.../src/main/scala/kafka/server/AdminManager.scala | 2 +-
.../main/scala/kafka/server/AlterIsrManager.scala | 180 +++++++
.../main/scala/kafka/server/BrokerFeatures.scala | 116 ++++
... => BrokerToControllerChannelManagerImpl.scala} | 30 +-
.../scala/kafka/server/DynamicBrokerConfig.scala | 18 +-
.../scala/kafka/server/FinalizedFeatureCache.scala | 91 +++-
.../server/FinalizedFeatureChangeListener.scala | 16 +-
core/src/main/scala/kafka/server/KafkaApis.scala | 322 ++++++-----
core/src/main/scala/kafka/server/KafkaConfig.scala | 39 +-
core/src/main/scala/kafka/server/KafkaServer.scala | 33 +-
.../scala/kafka/server/ReplicaFetcherThread.scala | 23 +-
.../main/scala/kafka/server/ReplicaManager.scala | 13 +-
.../scala/kafka/server/SupportedFeatures.scala | 93 ----
.../main/scala/kafka/tools/ConsoleConsumer.scala | 174 +++---
.../main/scala/kafka/tools/ConsoleProducer.scala | 4 +-
.../main/scala/kafka/tools/StreamsResetter.java | 28 +-
.../TestRaftRequestHandler.scala} | 19 +-
.../main/scala/kafka/tools/TestRaftServer.scala | 4 +-
core/src/main/scala/kafka/utils/CoreUtils.scala | 10 +-
core/src/main/scala/kafka/zk/KafkaZkClient.scala | 3 +-
core/src/main/scala/kafka/zk/ZkData.scala | 41 +-
.../kafka/api/AuthorizerIntegrationTest.scala | 27 +-
.../scala/integration/kafka/api/MetricsTest.scala | 5 +-
.../SaslScramSslEndToEndAuthorizationTest.scala | 11 +
.../kafka/network/DynamicConnectionQuotaTest.scala | 48 +-
.../kafka/server/DelayedFetchTest.scala | 4 +-
.../server/DynamicBrokerReconfigurationTest.scala | 7 +-
.../kafka/tools/DefaultMessageFormatterTest.scala | 237 +++++++++
.../test/scala/unit/kafka/KafkaConfigTest.scala | 11 +-
.../kafka/admin/ConsumerGroupCommandTest.scala | 2 -
.../kafka/admin/ResetConsumerGroupOffsetTest.scala | 35 +-
.../admin/TopicCommandWithAdminClientTest.scala | 80 ++-
.../unit/kafka/cluster/AbstractPartitionTest.scala | 6 +-
.../unit/kafka/cluster/PartitionLockTest.scala | 6 +-
.../scala/unit/kafka/cluster/PartitionTest.scala | 248 ++++++---
.../controller/ControllerIntegrationTest.scala | 156 +++++-
.../AbstractCoordinatorConcurrencyTest.scala | 2 +-
.../unit/kafka/network/ConnectionQuotasTest.scala | 28 +-
.../scala/unit/kafka/server/AdminManagerTest.scala | 32 ++
.../unit/kafka/server/AlterIsrManagerTest.scala | 302 +++++++++++
.../unit/kafka/server/BrokerFeaturesTest.scala | 106 ++++
.../kafka/server/DynamicBrokerConfigTest.scala | 6 +-
.../kafka/server/FinalizedFeatureCacheTest.scala | 78 +--
.../FinalizedFeatureChangeListenerTest.scala | 144 +++--
.../server/HighwatermarkPersistenceTest.scala | 6 +-
.../unit/kafka/server/IsrExpirationTest.scala | 6 +-
.../scala/unit/kafka/server/KafkaApisTest.scala | 43 +-
.../scala/unit/kafka/server/KafkaConfigTest.scala | 36 +-
.../unit/kafka/server/ListOffsetsRequestTest.scala | 41 +-
.../unit/kafka/server/LogDirFailureTest.scala | 3 -
.../scala/unit/kafka/server/LogOffsetTest.scala | 50 +-
.../kafka/server/ReplicaManagerQuotasTest.scala | 4 +-
.../unit/kafka/server/ReplicaManagerTest.scala | 21 +-
.../scala/unit/kafka/server/RequestQuotaTest.scala | 16 +-
.../unit/kafka/server/SupportedFeaturesTest.scala | 56 --
.../unit/kafka/server/UpdateFeaturesTest.scala | 581 ++++++++++++++++++++
.../server/epoch/OffsetsForLeaderEpochTest.scala | 7 +-
.../unit/kafka/tools/ConsoleConsumerTest.scala | 12 +-
.../test/scala/unit/kafka/utils/TestUtils.scala | 21 +-
docs/ops.html | 5 +
docs/security.html | 16 +
docs/streams/upgrade-guide.html | 12 +-
docs/upgrade.html | 11 +-
.../jmh/fetcher/ReplicaFetcherThreadBenchmark.java | 5 +-
.../jmh/metadata/MetadataRequestBenchmark.java | 7 +-
.../partition/PartitionMakeFollowerBenchmark.java | 5 +-
.../UpdateFollowerFetchStateBenchmark.java | 5 +-
.../apache/kafka/jmh/server/CheckpointBench.java | 5 +
.../kafka/log4jappender/KafkaLog4jAppender.java | 1 -
.../org/apache/kafka/raft/KafkaRaftClient.java | 2 +-
.../java/org/apache/kafka/raft/QuorumState.java | 12 +-
.../java/org/apache/kafka/raft/ReplicatedLog.java | 15 +-
.../java/org/apache/kafka/raft/VotedState.java | 6 +-
.../kafka/raft/internals/KafkaRaftMetrics.java | 2 +-
.../org/apache/kafka/raft/CandidateStateTest.java | 12 +-
.../apache/kafka/raft/FileBasedStateStoreTest.java | 12 +-
.../org/apache/kafka/raft/FollowerStateTest.java | 12 +-
.../org/apache/kafka/raft/KafkaRaftClientTest.java | 136 +++--
.../org/apache/kafka/raft/LeaderStateTest.java | 10 +-
.../apache/kafka/raft/MockFuturePurgatoryTest.java | 8 +-
.../test/java/org/apache/kafka/raft/MockLog.java | 8 +-
.../java/org/apache/kafka/raft/MockLogTest.java | 36 +-
.../org/apache/kafka/raft/QuorumStateTest.java | 29 +-
.../java/org/apache/kafka/raft/RaftConfigTest.java | 6 +-
.../apache/kafka/raft/RaftEventSimulationTest.java | 135 ++---
.../org/apache/kafka/raft/RequestManagerTest.java | 6 +-
.../java/org/apache/kafka/raft/VotedStateTest.java | 43 +-
.../kafka/raft/internals/KafkaRaftMetricsTest.java | 8 +-
.../examples/docs/DeveloperGuideTesting.java | 23 +-
.../examples/wordcount/WordCountProcessorTest.java | 1 +
.../wordcount/WordCountTransformerTest.java | 1 +
.../org/apache/kafka/streams/StreamsBuilder.java | 8 +
.../org/apache/kafka/streams/StreamsConfig.java | 2 +-
.../kstream/internals/KStreamAggregate.java | 3 -
.../internals/KStreamFlatTransformValues.java | 7 +-
.../internals/KStreamKTableJoinProcessor.java | 16 +-
.../streams/kstream/internals/KStreamPrint.java | 2 +-
.../streams/kstream/internals/KStreamReduce.java | 3 -
.../internals/KStreamSessionWindowAggregate.java | 4 -
.../kstream/internals/KStreamTransformValues.java | 6 +-
.../kstream/internals/KStreamWindowAggregate.java | 3 -
.../streams/kstream/internals/KTableAggregate.java | 4 +-
.../streams/kstream/internals/KTableFilter.java | 13 +-
.../streams/kstream/internals/KTableImpl.java | 21 +-
.../internals/KTableKTableAbstractJoin.java | 8 +-
.../kstream/internals/KTableKTableJoinMerger.java | 8 +-
.../streams/kstream/internals/KTableMapValues.java | 8 +-
.../KTableMaterializedValueGetterSupplier.java | 3 -
.../kstream/internals/KTableProcessorSupplier.java | 16 +-
.../streams/kstream/internals/KTableReduce.java | 4 +-
.../kstream/internals/KTableRepartitionMap.java | 3 +-
.../internals/KTableSourceValueGetterSupplier.java | 4 -
.../kstream/internals/KTableTransformValues.java | 9 +-
.../kstream/internals/KTableValueGetter.java | 2 +-
.../suppress/KTableSuppressProcessorSupplier.java | 16 +-
.../kafka/streams/processor/AbstractProcessor.java | 5 +-
.../kafka/streams/processor/ProcessorContext.java | 5 +-
.../apache/kafka/streams/processor/StateStore.java | 35 +-
.../kafka/streams/processor/StateStoreContext.java | 112 ++++
.../kafka/streams/processor/api/Processor.java | 7 +-
.../streams/processor/api/ProcessorContext.java | 173 +++---
.../apache/kafka/streams/processor/api/Record.java | 165 ++++++
.../api/RecordMetadata.java} | 23 +-
.../internals/AbstractProcessorContext.java | 72 +--
.../internals/AbstractReadOnlyDecorator.java | 8 +
.../internals/AbstractReadWriteDecorator.java | 11 +-
.../streams/processor/internals/AbstractTask.java | 60 ++-
.../ForwardingDisabledProcessorContext.java | 2 +-
.../internals/GlobalProcessorContextImpl.java | 27 +-
.../internals/GlobalStateManagerImpl.java | 3 +-
.../processor/internals/GlobalStateUpdateTask.java | 9 +-
.../internals/InternalApiProcessorContext.java | 119 -----
.../internals/InternalProcessorContext.java | 5 +-
.../processor/internals/ProcessorAdapter.java | 25 +-
.../internals/ProcessorContextAdapter.java | 235 ---------
.../processor/internals/ProcessorContextImpl.java | 105 ++--
.../internals/ProcessorContextReverseAdapter.java | 248 ---------
.../processor/internals/ProcessorContextUtils.java | 34 ++
.../streams/processor/internals/ProcessorNode.java | 38 +-
.../internals/ProcessorRecordContext.java | 4 +-
.../processor/internals/ProcessorStateManager.java | 9 +-
.../streams/processor/internals/SinkNode.java | 26 +-
.../streams/processor/internals/SourceNode.java | 5 +-
.../streams/processor/internals/StandbyTask.java | 14 +-
.../processor/internals/StateDirectory.java | 2 +-
...xt.java => StoreToProcessorContextAdapter.java} | 70 ++-
.../streams/processor/internals/StreamTask.java | 68 ++-
.../internals/StreamsPartitionAssignor.java | 4 +-
.../kafka/streams/processor/internals/Task.java | 7 +-
.../streams/processor/internals/TaskManager.java | 2 +
.../streams/processor/internals/ToInternal.java | 4 +
.../kafka/streams/state/ReadOnlyWindowStore.java | 14 +-
.../org/apache/kafka/streams/state/Stores.java | 6 +-
.../AbstractRocksDBSegmentedBytesStore.java | 1 +
.../state/internals/CachingKeyValueStore.java | 21 +-
.../state/internals/CachingSessionStore.java | 11 +-
.../state/internals/CachingWindowStore.java | 16 +-
.../internals/ChangeLoggingKeyValueBytesStore.java | 17 +-
.../internals/ChangeLoggingSessionBytesStore.java | 12 +-
.../internals/ChangeLoggingWindowBytesStore.java | 18 +-
.../state/internals/InMemoryKeyValueStore.java | 1 +
.../state/internals/InMemorySessionStore.java | 1 +
.../InMemoryTimeOrderedKeyValueBuffer.java | 17 +-
.../state/internals/InMemoryWindowStore.java | 1 +
.../streams/state/internals/KeyValueSegment.java | 8 +-
.../streams/state/internals/KeyValueSegments.java | 2 +-
.../state/internals/KeyValueStoreBuilder.java | 3 +-
...ValueToTimestampedKeyValueByteStoreAdapter.java | 7 +
.../streams/state/internals/MemoryLRUCache.java | 12 +
.../state/internals/MeteredKeyValueStore.java | 54 +-
.../state/internals/MeteredSessionStore.java | 54 +-
.../internals/MeteredTimestampedKeyValueStore.java | 16 +-
.../internals/MeteredTimestampedWindowStore.java | 19 +-
.../state/internals/MeteredWindowStore.java | 54 +-
.../streams/state/internals/RocksDBStore.java | 28 +-
.../state/internals/RocksDBWindowStore.java | 15 +-
.../state/internals/SessionStoreBuilder.java | 3 +-
.../internals/TimestampedKeyValueStoreBuilder.java | 10 +-
.../state/internals/TimestampedSegment.java | 8 +-
.../state/internals/TimestampedSegments.java | 2 +-
.../internals/TimestampedWindowStoreBuilder.java | 10 +-
.../internals/ValueAndTimestampSerializer.java | 68 ++-
.../state/internals/WindowStoreBuilder.java | 4 +
.../WindowToTimestampedWindowByteStoreAdapter.java | 7 +
.../streams/state/internals/WrappedStateStore.java | 7 +
.../org/apache/kafka/streams/KafkaStreamsTest.java | 25 +-
.../apache/kafka/streams/StreamsBuilderTest.java | 5 +-
.../apache/kafka/streams/StreamsConfigTest.java | 3 -
.../org/apache/kafka/streams/TopologyTest.java | 8 +-
.../integration/AbstractJoinIntegrationTest.java | 2 +-
.../integration/SuppressionIntegrationTest.java | 1 -
.../internals/KStreamGlobalKTableJoinTest.java | 37 +-
.../internals/KStreamGlobalKTableLeftJoinTest.java | 48 +-
.../kstream/internals/KStreamKTableJoinTest.java | 4 +-
...KStreamSessionWindowAggregateProcessorTest.java | 5 +-
.../kstream/internals/KStreamTransformTest.java | 5 +-
.../kstream/internals/KTableFilterTest.java | 39 +-
.../streams/kstream/internals/KTableImplTest.java | 151 +++++-
.../internals/KTableKTableInnerJoinTest.java | 2 +-
.../internals/KTableKTableLeftJoinTest.java | 2 +-
.../internals/KTableKTableOuterJoinTest.java | 2 +-
.../kstream/internals/KTableMapValuesTest.java | 2 +-
.../kstream/internals/KTableSourceTest.java | 2 +-
.../internals/KTableTransformValuesTest.java | 10 +-
.../kstream/internals/SuppressScenarioTest.java | 2 +-
...scriptionResolverJoinProcessorSupplierTest.java | 3 -
.../KTableSuppressProcessorMetricsTest.java | 3 +-
.../suppress/KTableSuppressProcessorTest.java | 3 +-
.../internals/AbstractProcessorContextTest.java | 46 +-
.../internals/GlobalProcessorContextImplTest.java | 19 +-
.../internals/GlobalStateManagerImplTest.java | 22 +
.../processor/internals/GlobalStateTaskTest.java | 9 +-
.../internals/GlobalStreamThreadTest.java | 4 +-
.../internals/ProcessorContextImplTest.java | 3 +-
.../processor/internals/ProcessorNodeTest.java | 9 +-
.../internals/ProcessorStateManagerTest.java | 35 +-
.../processor/internals/ProcessorTopologyTest.java | 36 +-
.../streams/processor/internals/SinkNodeTest.java | 3 +-
.../processor/internals/StandbyTaskTest.java | 31 ++
.../processor/internals/StateDirectoryTest.java | 34 ++
.../processor/internals/StreamTaskTest.java | 100 +++-
.../processor/internals/StreamThreadTest.java | 20 +-
.../processor/internals/TaskManagerTest.java | 9 +-
.../TimestampedKeyValueStoreMaterializerTest.java | 1 +
.../internals/testutil/ConsumerRecordUtil.java | 46 ++
.../streams/state/KeyValueStoreTestDriver.java | 7 +-
.../kafka/streams/state/NoOpWindowStore.java | 1 +
.../state/internals/AbstractKeyValueStoreTest.java | 4 +-
.../AbstractRocksDBSegmentedBytesStoreTest.java | 13 +-
.../internals/AbstractSessionBytesStoreTest.java | 9 +-
.../internals/AbstractWindowBytesStoreTest.java | 13 +-
.../state/internals/CachingKeyValueStoreTest.java | 32 +-
.../state/internals/CachingSessionStoreTest.java | 33 +-
.../state/internals/CachingWindowStoreTest.java | 32 +-
.../ChangeLoggingKeyValueBytesStoreTest.java | 43 +-
.../ChangeLoggingSessionBytesStoreTest.java | 25 +-
...geLoggingTimestampedKeyValueBytesStoreTest.java | 43 +-
...angeLoggingTimestampedWindowBytesStoreTest.java | 25 +-
.../ChangeLoggingWindowBytesStoreTest.java | 25 +-
.../CompositeReadOnlyKeyValueStoreTest.java | 3 +-
.../internals/GlobalStateStoreProviderTest.java | 43 +-
.../internals/InMemoryKeyValueLoggedStoreTest.java | 4 +-
.../state/internals/InMemoryKeyValueStoreTest.java | 4 +-
.../state/internals/InMemoryLRUCacheStoreTest.java | 4 +-
.../state/internals/KeyValueSegmentTest.java | 2 +-
.../state/internals/KeyValueStoreBuilderTest.java | 17 +-
.../state/internals/MeteredKeyValueStoreTest.java | 43 +-
.../state/internals/MeteredSessionStoreTest.java | 43 +-
.../MeteredTimestampedKeyValueStoreTest.java | 47 +-
.../MeteredTimestampedWindowStoreTest.java | 52 +-
.../state/internals/MeteredWindowStoreTest.java | 65 ++-
.../state/internals/OffsetCheckpointTest.java | 12 +
.../state/internals/ReadOnlyWindowStoreStub.java | 1 +
.../state/internals/RocksDBKeyValueStoreTest.java | 22 +-
.../streams/state/internals/RocksDBStoreTest.java | 77 +--
.../internals/RocksDBTimestampedStoreTest.java | 15 +-
.../state/internals/RocksDBWindowStoreTest.java | 7 +-
.../state/internals/SegmentIteratorTest.java | 5 +-
.../state/internals/SessionStoreBuilderTest.java | 23 +-
.../StreamThreadStateStoreProviderTest.java | 27 +
.../internals/TimeOrderedKeyValueBufferTest.java | 37 +-
.../TimestampedKeyValueStoreBuilderTest.java | 11 +-
.../state/internals/TimestampedSegmentTest.java | 2 +-
.../TimestampedWindowStoreBuilderTest.java | 21 +
.../internals/ValueAndTimestampSerializerTest.java | 4 +-
.../state/internals/WindowStoreBuilderTest.java | 23 +
.../tests/StreamsBrokerDownResilienceTest.java | 2 -
.../kafka/streams/tests/StreamsOptimizedTest.java | 1 -
.../streams/tests/StreamsStandByReplicaTest.java | 2 -
.../kafka/streams/tools/StreamsResetterTest.java | 38 --
.../kafka/test/GenericInMemoryKeyValueStore.java | 1 +
.../GenericInMemoryTimestampedKeyValueStore.java | 1 +
.../kafka/test/InternalMockProcessorContext.java | 31 +-
.../org/apache/kafka/test/MockApiProcessor.java | 21 +-
.../kafka/test/MockInternalProcessorContext.java | 19 +
.../org/apache/kafka/test/MockKeyValueStore.java | 1 +
.../java/org/apache/kafka/test/MockProcessor.java | 8 +-
.../org/apache/kafka/test/MockProcessorNode.java | 5 +-
.../kafka/test/MockRocksDbConfigSetter.java} | 32 +-
.../java/org/apache/kafka/test/MockSourceNode.java | 11 +-
.../apache/kafka/test/NoOpProcessorContext.java | 15 +-
.../org/apache/kafka/test/NoOpReadOnlyStore.java | 1 +
.../kafka/test/ReadOnlySessionStoreStub.java | 1 +
.../kafka/streams/scala/kstream/KTableTest.scala | 20 +-
.../apache/kafka/streams/TopologyTestDriver.java | 18 +-
.../streams/internals/KeyValueStoreFacade.java | 7 +
.../kafka/streams/internals/WindowStoreFacade.java | 7 +
.../streams/processor/MockProcessorContext.java | 5 +-
.../kafka/streams/MockProcessorContextTest.java | 3 +-
.../kafka/streams/TopologyTestDriverTest.java | 126 +++--
.../streams/internals/KeyValueStoreFacadeTest.java | 1 +
.../streams/internals/WindowStoreFacadeTest.java | 1 +
.../wordcount/WindowedWordCountProcessorTest.java | 4 +
tests/docker/Dockerfile | 6 +-
tests/docker/ducker-ak | 2 +-
tests/kafkatest/benchmarks/core/benchmark_test.py | 4 +-
.../sanity_checks/test_console_consumer.py | 1 -
.../sanity_checks/test_verifiable_producer.py | 2 +-
tests/kafkatest/services/console_consumer.py | 1 -
tests/kafkatest/services/kafka/__init__.py | 6 +-
tests/kafkatest/services/kafka/config.py | 4 +-
tests/kafkatest/services/kafka/kafka.py | 6 +-
.../services/kafka/templates/kafka.properties | 4 +-
tests/kafkatest/services/monitor/http.py | 6 +-
tests/kafkatest/services/monitor/jmx.py | 2 +-
tests/kafkatest/services/performance/__init__.py | 8 +-
.../services/performance/producer_performance.py | 2 +-
tests/kafkatest/services/security/minikdc.py | 2 -
.../kafkatest/services/security/security_config.py | 2 +-
tests/kafkatest/services/streams.py | 7 +-
.../services/templates/tools_log4j.properties | 2 +-
tests/kafkatest/services/trogdor/task_spec.py | 2 +-
tests/kafkatest/services/verifiable_client.py | 1 -
tests/kafkatest/services/verifiable_consumer.py | 20 +-
tests/kafkatest/services/zookeeper.py | 1 -
.../client/client_compatibility_features_test.py | 10 +-
tests/kafkatest/tests/client/quota_test.py | 2 +-
.../tests/connect/connect_distributed_test.py | 23 +-
tests/kafkatest/tests/connect/connect_test.py | 5 +-
tests/kafkatest/tests/core/downgrade_test.py | 7 +-
.../kafkatest/tests/core/get_offset_shell_test.py | 1 -
tests/kafkatest/tests/core/mirror_maker_test.py | 2 +-
tests/kafkatest/tests/core/network_degrade_test.py | 2 +-
.../tests/core/reassign_partitions_test.py | 2 +-
tests/kafkatest/tests/core/replica_scale_test.py | 6 +-
tests/kafkatest/tests/core/throttling_test.py | 2 +-
tests/kafkatest/tests/core/transactions_test.py | 2 +-
.../tests/core/zookeeper_security_upgrade_test.py | 2 +-
.../tests/core/zookeeper_tls_encrypt_only_test.py | 3 -
tests/kafkatest/tests/core/zookeeper_tls_test.py | 3 -
tests/kafkatest/tests/end_to_end.py | 4 +-
.../tests/streams/streams_broker_bounce_test.py | 4 +-
.../streams_cooperative_rebalance_upgrade_test.py | 3 +-
.../streams/streams_static_membership_test.py | 4 +-
.../tests/streams/streams_upgrade_test.py | 4 +-
.../streams/templates/log4j_template.properties | 2 +-
tests/kafkatest/tests/streams/utils/__init__.py | 2 +-
tests/kafkatest/tests/streams/utils/util.py | 9 +
tests/kafkatest/tests/tools/log4j_appender_test.py | 1 -
tests/kafkatest/tests/verifiable_consumer_test.py | 2 +-
tests/kafkatest/utils/__init__.py | 2 +-
tests/kafkatest/utils/util.py | 2 -
tests/kafkatest/version.py | 13 +
.../org/apache/kafka/tools/VerifiableProducer.java | 1 -
.../kafka/trogdor/coordinator/TaskManager.java | 4 +-
.../kafka/trogdor/workload/ProduceBenchWorker.java | 2 +-
456 files changed, 12068 insertions(+), 4587 deletions(-)
diff --cc bin/kafka-server-stop.sh
index fd6b0b6,4c86fdd..d9beb25
--- a/bin/kafka-server-stop.sh
+++ b/bin/kafka-server-stop.sh
@@@ -24,8 -24,7 +24,8 @@@ if [[ "$OSNAME" == "OS/390" ]]; the
elif [[ "$OSNAME" == "OS400" ]]; then
PIDS=$(ps -af | grep -i 'kafka\.Kafka' | grep java | grep -v grep | awk
'{print $2}')
else
- PIDS=$(ps ax | grep -i 'kafka\.Kafka' | grep java | grep -v grep | awk
'{print $1}')
+ PIDS=$(ps ax | grep ' kafka\.Kafka ' | grep java | grep -v grep | awk
'{print $1}')
+ PIDS_SUPPORT=$(ps ax | grep -i
'io\.confluent\.support\.metrics\.SupportedKafka' | grep java | grep -v grep |
awk '{print $1}')
fi
if [ -z "$PIDS" ]; then
