Github user NicoK commented on a diff in the pull request:
https://github.com/apache/flink/pull/4533#discussion_r154322032
--- Diff:
flink-runtime/src/test/java/org/apache/flink/runtime/io/network/netty/PartitionRequestClientHandlerTest.java
---
@@ -244,54 +237,89 @@ public void testCancelBeforeActive() throws Exception
{
}
/**
- * Verifies that {@link RemoteInputChannel} is enqueued in the
pipeline, and
- * {@link AddCredit} message is sent to the producer.
+ * Verifies that {@link RemoteInputChannel} is enqueued in the pipeline
for notifying credits,
+ * and verifies the behaviour of credit notification by triggering
channel's writability changed.
*/
@Test
public void testNotifyCreditAvailable() throws Exception {
+ final SingleInputGate inputGate = createSingleInputGate();
+ final RemoteInputChannel inputChannel1 =
spy(createRemoteInputChannel(inputGate));
+ final RemoteInputChannel inputChannel2 =
spy(createRemoteInputChannel(inputGate));
final CreditBasedClientHandler handler = new
CreditBasedClientHandler();
- final EmbeddedChannel channel = new EmbeddedChannel(handler);
+ final EmbeddedChannel channel = spy(new
EmbeddedChannel(handler));
- final RemoteInputChannel inputChannel =
createRemoteInputChannel(mock(SingleInputGate.class));
+ // Increase the credits to enqueue the input channels
+ inputChannel1.increaseCredit(1);
+ inputChannel2.increaseCredit(1);
+ handler.notifyCreditAvailable(inputChannel1);
+ handler.notifyCreditAvailable(inputChannel2);
- // Enqueue the input channel
- handler.notifyCreditAvailable(inputChannel);
+ channel.runPendingTasks();
+
+ // The two input channels should notify credits via writable
channel
+ assertTrue(channel.isWritable());
+ assertEquals(channel.readOutbound().getClass(),
AddCredit.class);
+ verify(inputChannel1, times(1)).getAndResetCredit();
+ verify(inputChannel2, times(1)).getAndResetCredit();
+
+ final int highWaterMark =
channel.config().getWriteBufferHighWaterMark();
+ // Set the writer index to the high water mark to ensure that
all bytes are written
+ // to the wire although the buffer is "empty".
+
channel.write(Unpooled.buffer(highWaterMark).writerIndex(highWaterMark));
+
+ // Enqueue the input channel on the condition of un-writable
channel
+ inputChannel1.increaseCredit(1);
+ handler.notifyCreditAvailable(inputChannel1);
channel.runPendingTasks();
- // Read the enqueued msg
- Object msg1 = channel.readOutbound();
+ // The input channel will not notify credits via un-writable
channel
+ assertFalse(channel.isWritable());
+ verify(inputChannel1, times(1)).getAndResetCredit();
- // Should notify credit
- assertEquals(msg1.getClass(), AddCredit.class);
+ // Flush the buffer to make the channel writable again
+ channel.flush();
+
+ // The input channel should notify credits via triggering
channel's writability changed event
+ assertTrue(channel.isWritable());
+ assertEquals(channel.readOutbound().getClass(),
AddCredit.class);
+ verify(inputChannel1, times(2)).getAndResetCredit();
}
/**
* Verifies that {@link RemoteInputChannel} is enqueued in the
pipeline, but {@link AddCredit}
- * message is not sent actually after this input channel is released.
+ * message is not sent actually when this input channel is released.
*/
@Test
public void testNotifyCreditAvailableAfterReleased() throws Exception {
+ final SingleInputGate inputGate = createSingleInputGate();
+ final RemoteInputChannel inputChannel =
createRemoteInputChannel(inputGate);
+
inputGate.setInputChannel(inputChannel.getPartitionId().getPartitionId(),
inputChannel);
+
final CreditBasedClientHandler handler = new
CreditBasedClientHandler();
final EmbeddedChannel channel = new EmbeddedChannel(handler);
- final RemoteInputChannel inputChannel =
createRemoteInputChannel(mock(SingleInputGate.class));
-
- // Enqueue the input channel then release it
+ // Increase the credits to enqueue the input channel, then
release it
+ inputChannel.increaseCredit(1);
--- End diff --
use `BufferResponse` here as well
---
