mosche commented on code in PR #23540: URL: https://github.com/apache/beam/pull/23540#discussion_r1096149668
########## sdks/java/io/amazon-web-services2/src/test/java/org/apache/beam/sdk/io/aws2/kinesis/enhancedfanout/helpers/KinesisClientProxyStub.java: ########## @@ -0,0 +1,194 @@ +/* + * 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.beam.sdk.io.aws2.kinesis.enhancedfanout.helpers; + +import static org.apache.beam.sdk.io.aws2.kinesis.enhancedfanout.helpers.RecordsGenerators.createRecord; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.mock; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.concurrent.BlockingQueue; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.function.Function; +import java.util.stream.Collectors; +import java.util.stream.IntStream; +import java.util.stream.Stream; +import org.apache.beam.sdk.io.aws2.kinesis.enhancedfanout.AsyncClientProxy; +import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList; +import org.reactivestreams.Subscriber; +import org.reactivestreams.Subscription; +import software.amazon.awssdk.services.kinesis.model.ListShardsRequest; +import software.amazon.awssdk.services.kinesis.model.ListShardsResponse; +import software.amazon.awssdk.services.kinesis.model.SequenceNumberRange; +import software.amazon.awssdk.services.kinesis.model.Shard; +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.SubscribeToShardResponse; +import software.amazon.awssdk.services.kinesis.model.SubscribeToShardResponseHandler; + +public class KinesisClientProxyStub implements AsyncClientProxy { + private final KinesisClientStubConfig config; + private final BlockingQueue<SubscribeToShardRequest> subscribeRequestsCollector; + private final AtomicInteger seqNumber; + private final AtomicInteger subscriptionsCountdown; + private final Function<KinesisClientStubShardState, Void> eventsSubmitter; + + KinesisClientProxyStub( + KinesisClientStubConfig config, + AtomicInteger subscriptionsCountdown, + AtomicInteger seqNumber, + BlockingQueue<SubscribeToShardRequest> subscribeRequestsCollector, + Function<KinesisClientStubShardState, Void> eventsSubmitter) { + this.config = config; + this.seqNumber = seqNumber; + this.subscriptionsCountdown = subscriptionsCountdown; + this.subscribeRequestsCollector = subscribeRequestsCollector; + this.eventsSubmitter = eventsSubmitter; + } + + @Override + public CompletableFuture<ListShardsResponse> listShards(ListShardsRequest listShardsRequest) { + if (listShardsRequest.shardFilter().shardId() == null) { + return CompletableFuture.completedFuture( + ListShardsResponse.builder() + .shards(buildShards(0, config.getInitialShardsCnt())) + .build()); + } else { + return CompletableFuture.completedFuture( + ListShardsResponse.builder() + .shards(buildShards(config.getInitialShardsCnt(), config.getFinalShardId() + 1)) + .build()); + } + } + + @Override + public CompletableFuture<Void> subscribeToShard( + SubscribeToShardRequest request, SubscribeToShardResponseHandler responseHandler) { + subscribeRequestsCollector.add(request); + + return CompletableFuture.supplyAsync( Review Comment: @psolomin Regarding tests, there's definitely a problem with the stubbed behavior here. The future returned by supplyAsync completes instantly, there's nothing that would block / delay that. And that triggers an immediate resubscribe. Give it a try like this: ```Java package org.apache.beam.sdk.io.aws2.kinesis.enhancedfanout; import org.reactivestreams.Subscriber; import org.reactivestreams.Subscription; import software.amazon.awssdk.core.async.SdkPublisher; import software.amazon.awssdk.services.kinesis.KinesisAsyncClient; 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 javax.annotation.Nullable; import java.util.ArrayDeque; import java.util.Deque; import java.util.HashMap; import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.atomic.AtomicInteger; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Preconditions.checkNotNull; // Just implements subscribeToShard, everything else will throw public class StubbedKinesisAsyncClient implements KinesisAsyncClient { private final ScheduledExecutorService scheduler = Executors.newSingleThreadScheduledExecutor(); private final int publisherRateMs; private final Map<String, Deque<StubbedSdkPublisher>> stubbedPublishers = new HashMap<>(); public StubbedKinesisAsyncClient(int publisherRateMs) { this.publisherRateMs = publisherRateMs; } /** * Stubs a subscribeToShard call with the provided events, optionally terminating with an error or * otherwise normally as soon as all events are delivered. */ public CanFail stubSubscribeToShard(String shardId, SubscribeToShardEventStream... events) { StubbedSdkPublisher publisher = new StubbedSdkPublisher(events); stubbedPublishers.computeIfAbsent(shardId, id -> new ArrayDeque<>()).add(publisher); return publisher; } @Override public CompletableFuture<Void> subscribeToShard( SubscribeToShardRequest req, SubscribeToShardResponseHandler resp) { Deque<StubbedSdkPublisher> publishers = checkNotNull(stubbedPublishers.get(req.shardId()), "Not stubbed"); StubbedSdkPublisher publisher = checkNotNull(publishers.poll(), "No more stubs"); resp.onEventStream(publisher); return publisher.result; } @Override public void close() { scheduler.shutdown(); } @Override public String serviceName() { return "kinesis"; } public interface CanFail { void failWith(Throwable error); } private class StubbedSdkPublisher implements SdkPublisher<SubscribeToShardEventStream>, CanFail { final CompletableFuture<Void> result = new CompletableFuture<>(); final SubscribeToShardEventStream[] events; @Nullable Throwable error = null; StubbedSdkPublisher(SubscribeToShardEventStream[] events) { this.events = events; } public void failWith(Throwable error) { this.error = error; } @Override public void subscribe(Subscriber<? super SubscribeToShardEventStream> subscriber) { AtomicInteger requested = new AtomicInteger(); subscriber.onSubscribe( new Subscription() { { scheduler.schedule(this::publish, publisherRateMs, MILLISECONDS); } @Override public void request(long n) { requested.incrementAndGet(); } @Override public void cancel() { result.complete(null); } int idx = 0; void publish() { if (!result.isDone() && idx < events.length) { if (requested.getAndUpdate(i -> Math.max(0, i - 1)) > 0) { subscriber.onNext(events[idx++]); } scheduler.schedule(this::publish, publisherRateMs, MILLISECONDS); } else if (error != null) { subscriber.onError(error); result.completeExceptionally(error); } else { subscriber.onComplete(); result.complete(null); } } }); } } } ``` -- 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]
