Merge #2765 into 1.1.6

Signed-off-by: OlegDokuka <[email protected]>

Author: Oleh Dokuka

reactor-netty-core/src/main/java/reactor/netty/channel/MonoSendMany.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2022 VMware, Inc. or its affiliates, All Rights Reserved.
+ * Copyright (c) 2019-2023 VMware, Inc. or its affiliates, All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -351,6 +351,17 @@ public void run() {
 						else {
 							actual.onError(t);
 						}
+
+						if (sourceMode == ASYNC) {
+							// notify that queue draining is done and no more interactions are expected for here
+							//
+							// This is needed due to ASYNC fusion contract.
+							// This call notifies upstream that the interaction with the queue is done on the
+							// downstream side.
+							// Some upstreams implementations may have `onClose()` mechanism to send notification
+							// about its termination and finalization of the offered events consumption
+							queue.clear();
+						}
 						return;
 					}
 

reactor-netty-core/src/test/java/reactor/netty/channel/MonoSendManyTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2021 VMware, Inc. or its affiliates, All Rights Reserved.
+ * Copyright (c) 2019-2023 VMware, Inc. or its affiliates, All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,6 +22,7 @@
 import java.util.List;
 import java.util.Queue;
 import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -32,14 +33,18 @@
 import io.netty.handler.timeout.WriteTimeoutHandler;
 import io.netty.util.ReferenceCountUtil;
 import io.netty.util.ReferenceCounted;
+import org.assertj.core.api.Assertions;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 import org.reactivestreams.Subscription;
+import reactor.core.CoreSubscriber;
 import reactor.core.Exceptions;
+import reactor.core.Fuseable;
 import reactor.core.publisher.BaseSubscriber;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Hooks;
 import reactor.core.publisher.Mono;
+import reactor.core.publisher.Operators;
 import reactor.core.publisher.Sinks;
 import reactor.test.StepVerifier;
 import reactor.test.publisher.TestPublisher;
@@ -259,6 +264,84 @@ void shouldNotLeakIfFusedOnRacingCancelAndOnNext(boolean flushOnEach) {
 		}
 	}
 
+
+	@ParameterizedTest
+	@ValueSource(booleans = {true, false})
+	void shouldCallQueueClearToNotifyTermination(boolean flushOnEach) {
+		//use an extra handler
+		EmbeddedChannel channel = new EmbeddedChannel(true, true, new ChannelHandlerAdapter() {});
+		AtomicBoolean cleared = new AtomicBoolean();
+
+		Sinks.Many<ByteBuf> source = Sinks.many().unicast().onBackpressureBuffer();
+		MonoSendMany<ByteBuf, ByteBuf> m =
+				MonoSendMany.byteBufSource(source.asFlux().transform(Operators.<ByteBuf, ByteBuf>lift((__,
+						downstream) -> new CoreSubscriber<ByteBuf>() {
+					@Override
+					public void onSubscribe(Subscription s) {
+						downstream.onSubscribe(new Fuseable.QueueSubscription<ByteBuf>() {
+							@Override
+							public void request(long n) {
+								s.request(n);
+							}
+
+							@Override
+							public void cancel() {
+								s.cancel();
+							}
+
+							@Override
+							public int size() {
+								return ((Fuseable.QueueSubscription<ByteBuf>) s).size();
+							}
+
+							@Override
+							public boolean isEmpty() {
+								return ((Fuseable.QueueSubscription<ByteBuf>) s).isEmpty();
+							}
+
+							@Override
+							public void clear() {
+								cleared.set(true);
+								((Fuseable.QueueSubscription<ByteBuf>) s).clear();
+							}
+
+							@Override
+							public ByteBuf poll() {
+								return ((Fuseable.QueueSubscription<ByteBuf>) s).poll();
+							}
+
+							@Override
+							public int requestFusion(int requestedMode) {
+								return ((Fuseable.QueueSubscription<ByteBuf>) s).requestFusion(requestedMode);
+							}
+						});
+					}
+
+					@Override
+					public void onNext(ByteBuf buf) {
+						downstream.onNext(buf);
+					}
+
+					@Override
+					public void onError(Throwable t) {
+						downstream.onError(t);
+					}
+
+					@Override
+					public void onComplete() {
+						downstream.onComplete();
+					}
+				})), channel, b -> flushOnEach);
+		m.subscribe();
+		Queue<Object> messages = channel.outboundMessages();
+
+		source.emitComplete(Sinks.EmitFailureHandler.FAIL_FAST);
+
+		channel.flush();
+		messages.forEach(ReferenceCountUtil::release);
+		Assertions.assertThat(cleared).isTrue();
+	}
+
 	static void wait(WeakReference<Subscription> ref) {
 		int duration = 5_000;
 		int spins = duration / 100;