Skip to content

added channel.isActive() to clientIsOffline adn relevant test case #9940

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Avinash1423 wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

added channel.isActive() to clientIsOffline adn relevant test case #9940

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .../src/main/java/org/apache/rocketmq/proxy/service/receipt/DefaultReceiptHandleManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,10 @@ public MessageReceiptHandle removeReceiptHandle(ProxyContext context, Channel ch
}

protected boolean clientIsOffline(ReceiptHandleGroupKey groupKey) {
return this.consumerManager.findChannel(groupKey.getGroup(), groupKey.getChannel()) == null;
ClientChannelInfo clientChannelInfo= this.consumerManager.findChannel(groupKey.getGroup(), groupKey.getChannel());
Channel channel=clientChannelInfo.getChannel();
return channel==null || !channel.isActive();

}

protected void scheduleRenewTask() {
Expand Down
19 changes: 17 additions & 2 deletions .../test/java/org/apache/rocketmq/proxy/service/receipt/DefaultReceiptHandleManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,7 @@
import org.mockito.stubbing.Answer;

import static org.awaitility.Awaitility.await;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.*;

public class DefaultReceiptHandleManagerTest extends BaseServiceTest {
private DefaultReceiptHandleManager receiptHandleManager;
Expand Down Expand Up @@ -463,4 +462,20 @@ public void testClientOffline() {
listenerArgumentCaptor.getValue().handle(ConsumerGroupEvent.CLIENT_UNREGISTER, GROUP, new ClientChannelInfo(channel, "", LanguageCode.JAVA, 0));
assertTrue(receiptHandleManager.receiptHandleGroupMap.isEmpty());
}

@Test
public void testClientOffline_channelInactive(){

Channel mockChannel=Mockito.mock(Channel.class);
ClientChannelInfo mockClientChannelInfo=Mockito.mock(ClientChannelInfo.class);
ReceiptHandleGroupKey mockReceiptHandleGroupKey=new ReceiptHandleGroupKey(mockChannel,GROUP);
Mockito.when(consumerManager.findChannel(GROUP,mockChannel)).thenReturn(mockClientChannelInfo);
Mockito.when(mockClientChannelInfo.getChannel()).thenReturn(mockChannel);
Mockito.when(mockChannel.isActive()).thenReturn(false);
assertTrue(receiptHandleManager.clientIsOffline(mockReceiptHandleGroupKey));

}



}
Loading