markap14 commented on code in PR #10964: URL: https://github.com/apache/nifi/pull/10964#discussion_r2907933877
########## nifi-extension-bundles/nifi-aws-bundle/nifi-aws-kinesis/src/main/java/org/apache/nifi/processors/aws/kinesis/EfoKinesisClient.java: ########## @@ -0,0 +1,596 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.nifi.processors.aws.kinesis; + +import org.apache.nifi.logging.ComponentLog; +import org.apache.nifi.processor.exception.ProcessException; +import org.reactivestreams.Subscriber; +import org.reactivestreams.Subscription; +import software.amazon.awssdk.awscore.exception.AwsServiceException; +import software.amazon.awssdk.core.exception.SdkClientException; +import software.amazon.awssdk.services.kinesis.KinesisAsyncClient; +import software.amazon.awssdk.services.kinesis.KinesisClient; +import software.amazon.awssdk.services.kinesis.model.ConsumerStatus; +import software.amazon.awssdk.services.kinesis.model.DeregisterStreamConsumerRequest; +import software.amazon.awssdk.services.kinesis.model.DescribeStreamConsumerRequest; +import software.amazon.awssdk.services.kinesis.model.DescribeStreamRequest; +import software.amazon.awssdk.services.kinesis.model.DescribeStreamResponse; +import software.amazon.awssdk.services.kinesis.model.LimitExceededException; +import software.amazon.awssdk.services.kinesis.model.Record; +import software.amazon.awssdk.services.kinesis.model.RegisterStreamConsumerRequest; +import software.amazon.awssdk.services.kinesis.model.RegisterStreamConsumerResponse; +import software.amazon.awssdk.services.kinesis.model.ResourceInUseException; +import software.amazon.awssdk.services.kinesis.model.ResourceNotFoundException; +import software.amazon.awssdk.services.kinesis.model.Shard; +import software.amazon.awssdk.services.kinesis.model.ShardIteratorType; +import software.amazon.awssdk.services.kinesis.model.StartingPosition; +import software.amazon.awssdk.services.kinesis.model.SubscribeToShardEvent; +import software.amazon.awssdk.services.kinesis.model.SubscribeToShardEventStream; +import software.amazon.awssdk.services.kinesis.model.SubscribeToShardRequest; +import software.amazon.awssdk.services.kinesis.model.SubscribeToShardResponseHandler; + +import java.io.IOException; +import java.math.BigInteger; +import java.time.Instant; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.CancellationException; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.atomic.AtomicLong; +import java.util.concurrent.atomic.AtomicReference; +import java.util.function.Consumer; + +/** + * Enhanced Fan-Out Kinesis consumer that uses SubscribeToShard with dedicated throughput + * per shard via HTTP/2. Uses Reactive Streams demand-driven backpressure to control the + * rate of event delivery. + */ +final class EfoKinesisClient extends KinesisConsumerClient { + + private static final long SUBSCRIBE_BACKOFF_NANOS = TimeUnit.SECONDS.toNanos(5); + private static final long CONSUMER_REGISTRATION_POLL_MILLIS = 1_000; + private static final int CONSUMER_REGISTRATION_MAX_ATTEMPTS = 60; + private static final int MAX_SUBSCRIPTIONS_PER_TRIGGER = 10; + private static final int MAX_QUEUED_RESULTS = 200; + + private final Map<String, ShardConsumer> shardConsumers = new ConcurrentHashMap<>(); + private volatile KinesisAsyncClient kinesisAsyncClient; + private volatile String consumerArn; + private volatile Instant timestampForInitialPosition; + + EfoKinesisClient(final KinesisClient kinesisClient, final ComponentLog logger) { + super(kinesisClient, logger); + } + + void setTimestampForInitialPosition(final Instant timestamp) { + this.timestampForInitialPosition = timestamp; + } + + @Override + void initialize(final KinesisAsyncClient asyncClient, final String streamName, final String consumerName) { + this.kinesisAsyncClient = asyncClient; + registerEfoConsumer(streamName, consumerName); + } + + @Override + void startFetches(final List<Shard> shards, final String streamName, final int batchSize, final String initialStreamPosition, final KinesisShardManager shardManager) { + if (totalQueuedResults() >= MAX_QUEUED_RESULTS) { + return; + } + + int subscriptionsCreated = 0; + final long now = System.nanoTime(); + + for (final Shard shard : shards) { + if (subscriptionsCreated >= MAX_SUBSCRIPTIONS_PER_TRIGGER) { + break; + } + + final String shardId = shard.shardId(); + final ShardConsumer existing = shardConsumers.get(shardId); + + if (existing == null) { + final String lastSeq = shardManager.readCheckpoint(shardId); + final StartingPosition startingPosition = buildStartingPosition(lastSeq, initialStreamPosition); + logger.info("Creating EFO subscription for shard {} with type={}, seq={}", shardId, startingPosition.type(), lastSeq); + final ShardConsumer sc = new ShardConsumer(shardId, EfoKinesisClient.this::enqueueResult, logger); + final ShardConsumer prior = shardConsumers.putIfAbsent(shardId, sc); + if (prior == null) { + try { + sc.subscribe(kinesisAsyncClient, consumerArn, startingPosition); + } catch (final Exception e) { + shardConsumers.remove(shardId, sc); + throw e; + } + subscriptionsCreated++; + } + } else if (existing.isSubscriptionExpired()) { + final long lastAttempt = existing.getLastSubscribeAttemptNanos(); + if (lastAttempt > 0 && now < lastAttempt + SUBSCRIBE_BACKOFF_NANOS) { + continue; + } + + final String resumeSeq = maxSequenceNumber( + existing.getLastQueuedSequenceNumber(), + existing.getLastAcknowledgedSequenceNumber(), + shardManager.readCheckpoint(shardId)); + final StartingPosition startingPosition = buildStartingPosition(resumeSeq, initialStreamPosition); + logger.debug("Renewing expired EFO subscription for shard {} with type={}, seq={}", shardId, startingPosition.type(), resumeSeq); + existing.subscribe(kinesisAsyncClient, consumerArn, startingPosition); + subscriptionsCreated++; + } + } + } + + @Override + boolean hasPendingFetches() { + return !shardConsumers.isEmpty(); + } + + @Override + long drainDeduplicatedEventCount() { + long total = 0; + for (final ShardConsumer sc : shardConsumers.values()) { + total += sc.drainDeduplicatedEventCount(); + } + return total; + } + + @Override + void acknowledgeResults(final List<ShardFetchResult> results) { + final Map<String, ShardConsumer> consumersToRequest = new HashMap<>(); + + for (final ShardFetchResult result : results) { + final ShardConsumer consumer = shardConsumers.get(result.shardId()); + if (consumer != null) { + consumer.acknowledgeSequenceNumber(result.lastSequenceNumber()); + consumer.markAcknowledged(); + consumersToRequest.putIfAbsent(result.shardId(), consumer); + } + } + + for (final ShardConsumer consumer : consumersToRequest.values()) { + consumer.requestNext(); + } + } + + @Override + void rollbackResults(final List<ShardFetchResult> results) { + for (final ShardFetchResult result : results) { + final ShardConsumer sc = shardConsumers.remove(result.shardId()); + if (sc != null) { + sc.cancel(); + } + } + } + + @Override + void removeUnownedShards(final Set<String> ownedShards) { + shardConsumers.entrySet().removeIf(entry -> { + if (!ownedShards.contains(entry.getKey())) { + entry.getValue().cancel(); + return true; + } + return false; + }); + } + + @Override + void logDiagnostics(final int ownedCount, final int cachedShardCount) { + if (!shouldLogDiagnostics()) { + return; + } + + final long now = System.nanoTime(); + int activeSubscriptions = 0; + int expiredSubscriptions = 0; + int backedOff = 0; + for (final ShardConsumer sc : shardConsumers.values()) { + if (sc.isSubscriptionExpired()) { + expiredSubscriptions++; + final long lastAttempt = sc.getLastSubscribeAttemptNanos(); + if (lastAttempt > 0 && now < lastAttempt + SUBSCRIBE_BACKOFF_NANOS) { + backedOff++; + } + } else { + activeSubscriptions++; + } + } + + final int queueDepth = totalQueuedResults(); + logger.debug("Kinesis EFO diagnostics: discoveredShards={}, ownedShards={}, queueDepth={}/{}, shardConsumers={}, activeSubscriptions={}, expiredSubscriptions={}, backedOff={}", + cachedShardCount, ownedCount, queueDepth, MAX_QUEUED_RESULTS, shardConsumers.size(), activeSubscriptions, expiredSubscriptions, backedOff); + } + + @Override + void close() { + for (final ShardConsumer sc : shardConsumers.values()) { + sc.cancel(); + } + shardConsumers.clear(); + + deregisterEfoConsumer(); Review Comment: Good catch! I hadn't considered that case. Will update it to only deregister in `@OnRemoved` so that if the processor is deleted from the canvas it will deregister it. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
