Skip to content
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

Jump to bottom

[ISSUE #6810] Fix the bug of mistakenly deleting data in clientChannelTable when the channel expires #7073

Merged
merged 2 commits into from
Jul 27, 2023
Merged

[ISSUE #6810] Fix the bug of mistakenly deleting data in clientChannelTable when the channel expires #7073

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d71455
[ISSUE #6810] Fix the bug of mistakenly deleting data in clientChanne…
zd46319 Jul 24, 2023
cb1e40f
Merge branch 'apache:develop' into develop
zd46319 Jul 27, 2023
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 broker/src/main/java/org/apache/rocketmq/broker/client/ProducerManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,10 @@ public void scanNotActiveChannel() {
long diff = System.currentTimeMillis() - info.getLastUpdateTimestamp();
if (diff > CHANNEL_EXPIRED_TIMEOUT) {
it.remove();
clientChannelTable.remove(info.getClientId());
Channel channelInClientTable = clientChannelTable.get(info.getClientId());
if (channelInClientTable != null && channelInClientTable.equals(info.getChannel())) {
clientChannelTable.remove(info.getClientId());
}
log.warn(
"ProducerManager#scanNotActiveChannel: remove expired channel[{}] from ProducerManager groupChannelTable, producer group name: {}",
RemotingHelper.parseChannelRemoteAddr(info.getChannel()), group);
Expand Down
34 changes: 34 additions & 0 deletions broker/src/test/java/org/apache/rocketmq/broker/client/ProducerManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.junit.MockitoJUnitRunner;

import static org.assertj.core.api.Assertions.assertThat;
Expand Down Expand Up @@ -79,6 +80,39 @@ public void scanNotActiveChannel() throws Exception {
assertThat(producerManager.findChannel("clientId")).isNull();
}

@Test
public void scanNotActiveChannelWithSameClientId() throws Exception {
producerManager.registerProducer(group, clientInfo);
Channel channel1 = Mockito.mock(Channel.class);
ClientChannelInfo clientInfo1 = new ClientChannelInfo(channel1, clientInfo.getClientId(), LanguageCode.JAVA, 0);
producerManager.registerProducer(group, clientInfo1);
AtomicReference<String> groupRef = new AtomicReference<>();
AtomicReference<ClientChannelInfo> clientChannelInfoRef = new AtomicReference<>();
producerManager.appendProducerChangeListener((event, group, clientChannelInfo) -> {
switch (event) {
case GROUP_UNREGISTER:
groupRef.set(group);
break;
case CLIENT_UNREGISTER:
clientChannelInfoRef.set(clientChannelInfo);
break;
default:
break;
}
});
assertThat(producerManager.getGroupChannelTable().get(group).get(channel)).isNotNull();
assertThat(producerManager.getGroupChannelTable().get(group).get(channel1)).isNotNull();
assertThat(producerManager.findChannel("clientId")).isNotNull();
Field field = ProducerManager.class.getDeclaredField("CHANNEL_EXPIRED_TIMEOUT");
field.setAccessible(true);
long channelExpiredTimeout = field.getLong(producerManager);
clientInfo.setLastUpdateTimestamp(System.currentTimeMillis() - channelExpiredTimeout - 10);
when(channel.close()).thenReturn(mock(ChannelFuture.class));
producerManager.scanNotActiveChannel();
assertThat(producerManager.getGroupChannelTable().get(group).get(channel1)).isNotNull();
assertThat(producerManager.findChannel("clientId")).isNotNull();
}

@Test
public void doChannelCloseEvent() throws Exception {
producerManager.registerProducer(group, clientInfo);
Expand Down
Loading