Skip to content

R
Rocketmq

小问号你是否有许多朋友 / Rocketmq
与 Fork 源项目一致

Fork自 Apache RocketMQ / Rocketmq

通知 1
Star 0
Fork 0
R
Rocketmq

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

提交 958eb749 编写于 作者: H huangli 提交者： Heng Du
浏览文件
操作

[for 4.6.0] Fix concurrent problem in ProducerManager.getAvaliableChannel; Fix... 

[for 4.6.0] Fix concurrent problem in ProducerManager.getAvaliableChannel; Fix problem that tx check may loss when channel is busy (#1627)
上级 366e6e72
隐藏空白更改
内联 并排
Showing with 127 addition and 170 deletion
broker/src/main/java/org/apache/rocketmq/broker/client/ProducerManager.java
浏览文件 @ 958eb749
...@@ -18,15 +18,11 @@ package org.apache.rocketmq.broker.client; ...@@ -18,15 +18,11 @@ package org.apache.rocketmq.broker.client;
import io.netty.channel.Channel; import io.netty.channel.Channel;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
import org.apache.rocketmq.broker.util.PositiveAtomicCounter; import org.apache.rocketmq.broker.util.PositiveAtomicCounter;
import org.apache.rocketmq.common.constant.LoggerName; import org.apache.rocketmq.common.constant.LoggerName;
import org.apache.rocketmq.logging.InternalLogger; import org.apache.rocketmq.logging.InternalLogger;
...@@ -36,205 +32,145 @@ import org.apache.rocketmq.remoting.common.RemotingUtil; ...@@ -36,205 +32,145 @@ import org.apache.rocketmq.remoting.common.RemotingUtil;
public class ProducerManager { public class ProducerManager {
private static final InternalLogger log = InternalLoggerFactory.getLogger(LoggerName.BROKER_LOGGER_NAME); private static final InternalLogger log = InternalLoggerFactory.getLogger(LoggerName.BROKER_LOGGER_NAME);
private static final long LOCK_TIMEOUT_MILLIS = 3000;
private static final long CHANNEL_EXPIRED_TIMEOUT = 1000 * 120; private static final long CHANNEL_EXPIRED_TIMEOUT = 1000 * 120;
private static final int GET_AVALIABLE_CHANNEL_RETRY_COUNT = 3; private static final int GET_AVALIABLE_CHANNEL_RETRY_COUNT = 3;
private final Lock groupChannelLock = new ReentrantLock(); private final ConcurrentHashMap<String /* group name */, ConcurrentHashMap<Channel, ClientChannelInfo>> groupChannelTable =
private final HashMap<String /* group name */, HashMap<Channel, ClientChannelInfo>> groupChannelTable = new ConcurrentHashMap<>();
new HashMap<String, HashMap<Channel, ClientChannelInfo>>();
private final ConcurrentHashMap<String, Channel> clientChannelTable = new ConcurrentHashMap<>(); private final ConcurrentHashMap<String, Channel> clientChannelTable = new ConcurrentHashMap<>();
private PositiveAtomicCounter positiveAtomicCounter = new PositiveAtomicCounter(); private PositiveAtomicCounter positiveAtomicCounter = new PositiveAtomicCounter();
public ProducerManager() { public ProducerManager() {
} }
public HashMap<String, HashMap<Channel, ClientChannelInfo>> getGroupChannelTable() { public ConcurrentHashMap<String, ConcurrentHashMap<Channel, ClientChannelInfo>> getGroupChannelTable() {
HashMap<String /* group name */, HashMap<Channel, ClientChannelInfo>> newGroupChannelTable = return groupChannelTable;
new HashMap<String, HashMap<Channel, ClientChannelInfo>>();
try {
if (this.groupChannelLock.tryLock(LOCK_TIMEOUT_MILLIS, TimeUnit.MILLISECONDS)) {
try {
Iterator<Map.Entry<String, HashMap<Channel, ClientChannelInfo>>> iter = groupChannelTable.entrySet().iterator();
while (iter.hasNext()) {
Map.Entry<String, HashMap<Channel, ClientChannelInfo>> entry = iter.next();
String key = entry.getKey();
HashMap<Channel, ClientChannelInfo> val = entry.getValue();
HashMap<Channel, ClientChannelInfo> tmp = new HashMap<Channel, ClientChannelInfo>();
tmp.putAll(val);
newGroupChannelTable.put(key, tmp);
}
} finally {
groupChannelLock.unlock();
}
}
} catch (InterruptedException e) {
log.error("", e);
}
return newGroupChannelTable;
} }
public void scanNotActiveChannel() { public void scanNotActiveChannel() {
try { for (final Map.Entry<String, ConcurrentHashMap<Channel, ClientChannelInfo>> entry : this.groupChannelTable
if (this.groupChannelLock.tryLock(LOCK_TIMEOUT_MILLIS, TimeUnit.MILLISECONDS)) { .entrySet()) {
try { final String group = entry.getKey();
for (final Map.Entry<String, HashMap<Channel, ClientChannelInfo>> entry : this.groupChannelTable final ConcurrentHashMap<Channel, ClientChannelInfo> chlMap = entry.getValue();
.entrySet()) {
final String group = entry.getKey(); Iterator<Entry<Channel, ClientChannelInfo>> it = chlMap.entrySet().iterator();
final HashMap<Channel, ClientChannelInfo> chlMap = entry.getValue(); while (it.hasNext()) {
Entry<Channel, ClientChannelInfo> item = it.next();
Iterator<Entry<Channel, ClientChannelInfo>> it = chlMap.entrySet().iterator(); // final Integer id = item.getKey();
while (it.hasNext()) { final ClientChannelInfo info = item.getValue();
Entry<Channel, ClientChannelInfo> item = it.next();
// final Integer id = item.getKey(); long diff = System.currentTimeMillis() - info.getLastUpdateTimestamp();
final ClientChannelInfo info = item.getValue(); if (diff > CHANNEL_EXPIRED_TIMEOUT) {
it.remove();
long diff = System.currentTimeMillis() - info.getLastUpdateTimestamp(); clientChannelTable.remove(info.getClientId());
if (diff > CHANNEL_EXPIRED_TIMEOUT) { log.warn(
it.remove(); "SCAN: remove expired channel[{}] from ProducerManager groupChannelTable, producer group name: {}",
clientChannelTable.remove(info.getClientId()); RemotingHelper.parseChannelRemoteAddr(info.getChannel()), group);
log.warn( RemotingUtil.closeChannel(info.getChannel());
"SCAN: remove expired channel[{}] from ProducerManager groupChannelTable, producer group name: {}",
RemotingHelper.parseChannelRemoteAddr(info.getChannel()), group);
RemotingUtil.closeChannel(info.getChannel());
}
}
}
} finally {
this.groupChannelLock.unlock();
} }
} else {
log.warn("ProducerManager scanNotActiveChannel lock timeout");
} }
} catch (InterruptedException e) {
log.error("", e);
} }
} }
public void doChannelCloseEvent(final String remoteAddr, final Channel channel) { public synchronized void doChannelCloseEvent(final String remoteAddr, final Channel channel) {
if (channel != null) { if (channel != null) {
try { for (final Map.Entry<String, ConcurrentHashMap<Channel, ClientChannelInfo>> entry : this.groupChannelTable
if (this.groupChannelLock.tryLock(LOCK_TIMEOUT_MILLIS, TimeUnit.MILLISECONDS)) { .entrySet()) {
try { final String group = entry.getKey();
for (final Map.Entry<String, HashMap<Channel, ClientChannelInfo>> entry : this.groupChannelTable final ConcurrentHashMap<Channel, ClientChannelInfo> clientChannelInfoTable =
.entrySet()) { entry.getValue();
final String group = entry.getKey(); final ClientChannelInfo clientChannelInfo =
final HashMap<Channel, ClientChannelInfo> clientChannelInfoTable = clientChannelInfoTable.remove(channel);
entry.getValue(); if (clientChannelInfo != null) {
final ClientChannelInfo clientChannelInfo = clientChannelTable.remove(clientChannelInfo.getClientId());
clientChannelInfoTable.remove(channel); log.info(
if (clientChannelInfo != null) { "NETTY EVENT: remove channel[{}][{}] from ProducerManager groupChannelTable, producer group: {}",
clientChannelTable.remove(clientChannelInfo.getClientId()); clientChannelInfo.toString(), remoteAddr, group);
log.info(
"NETTY EVENT: remove channel[{}][{}] from ProducerManager groupChannelTable, producer group: {}",
clientChannelInfo.toString(), remoteAddr, group);
}
}
} finally {
this.groupChannelLock.unlock();
}
} else {
log.warn("ProducerManager doChannelCloseEvent lock timeout");
} }
} catch (InterruptedException e) {
log.error("", e);
} }
} }
} }
public void registerProducer(final String group, final ClientChannelInfo clientChannelInfo) { public synchronized void registerProducer(final String group, final ClientChannelInfo clientChannelInfo) {
try { ClientChannelInfo clientChannelInfoFound = null;
ClientChannelInfo clientChannelInfoFound = null;
if (this.groupChannelLock.tryLock(LOCK_TIMEOUT_MILLIS, TimeUnit.MILLISECONDS)) {
try {
HashMap<Channel, ClientChannelInfo> channelTable = this.groupChannelTable.get(group);
if (null == channelTable) {
channelTable = new HashMap<>();
this.groupChannelTable.put(group, channelTable);
}
clientChannelInfoFound = channelTable.get(clientChannelInfo.getChannel());
if (null == clientChannelInfoFound) {
channelTable.put(clientChannelInfo.getChannel(), clientChannelInfo);
clientChannelTable.put(clientChannelInfo.getClientId(), clientChannelInfo.getChannel());
log.info("new producer connected, group: {} channel: {}", group,
clientChannelInfo.toString());
}
} finally {
this.groupChannelLock.unlock();
}
if (clientChannelInfoFound != null) { ConcurrentHashMap<Channel, ClientChannelInfo> channelTable = this.groupChannelTable.get(group);
clientChannelInfoFound.setLastUpdateTimestamp(System.currentTimeMillis()); if (null == channelTable) {
} channelTable = new ConcurrentHashMap<>();
} else { this.groupChannelTable.put(group, channelTable);
log.warn("ProducerManager registerProducer lock timeout"); }
}
} catch (InterruptedException e) { clientChannelInfoFound = channelTable.get(clientChannelInfo.getChannel());
log.error("", e); if (null == clientChannelInfoFound) {
channelTable.put(clientChannelInfo.getChannel(), clientChannelInfo);
clientChannelTable.put(clientChannelInfo.getClientId(), clientChannelInfo.getChannel());
log.info("new producer connected, group: {} channel: {}", group,
clientChannelInfo.toString());
}
if (clientChannelInfoFound != null) {
clientChannelInfoFound.setLastUpdateTimestamp(System.currentTimeMillis());
} }
} }
public void unregisterProducer(final String group, final ClientChannelInfo clientChannelInfo) { public synchronized void unregisterProducer(final String group, final ClientChannelInfo clientChannelInfo) {
try { ConcurrentHashMap<Channel, ClientChannelInfo> channelTable = this.groupChannelTable.get(group);
if (this.groupChannelLock.tryLock(LOCK_TIMEOUT_MILLIS, TimeUnit.MILLISECONDS)) { if (null != channelTable && !channelTable.isEmpty()) {
try { ClientChannelInfo old = channelTable.remove(clientChannelInfo.getChannel());
HashMap<Channel, ClientChannelInfo> channelTable = this.groupChannelTable.get(group); clientChannelTable.remove(clientChannelInfo.getClientId());
if (null != channelTable && !channelTable.isEmpty()) { if (old != null) {
ClientChannelInfo old = channelTable.remove(clientChannelInfo.getChannel()); log.info("unregister a producer[{}] from groupChannelTable {}", group,
clientChannelTable.remove(clientChannelInfo.getClientId()); clientChannelInfo.toString());
if (old != null) { }
log.info("unregister a producer[{}] from groupChannelTable {}", group,
clientChannelInfo.toString()); if (channelTable.isEmpty()) {
} this.groupChannelTable.remove(group);
log.info("unregister a producer group[{}] from groupChannelTable", group);
if (channelTable.isEmpty()) {
this.groupChannelTable.remove(group);
log.info("unregister a producer group[{}] from groupChannelTable", group);
}
}
} finally {
this.groupChannelLock.unlock();
}
} else {
log.warn("ProducerManager unregisterProducer lock timeout");
} }
} catch (InterruptedException e) {
log.error("", e);
} }
} }
public Channel getAvaliableChannel(String groupId) { public Channel getAvaliableChannel(String groupId) {
HashMap<Channel, ClientChannelInfo> channelClientChannelInfoHashMap = groupChannelTable.get(groupId); if (groupId == null) {
return null;
}
List<Channel> channelList = new ArrayList<Channel>(); List<Channel> channelList = new ArrayList<Channel>();
ConcurrentHashMap<Channel, ClientChannelInfo> channelClientChannelInfoHashMap = groupChannelTable.get(groupId);
if (channelClientChannelInfoHashMap != null) { if (channelClientChannelInfoHashMap != null) {
for (Channel channel : channelClientChannelInfoHashMap.keySet()) { for (Channel channel : channelClientChannelInfoHashMap.keySet()) {
channelList.add(channel); channelList.add(channel);
} }
int size = channelList.size();
if (0 == size) {
log.warn("Channel list is empty. groupId={}", groupId);
return null;
}
int index = positiveAtomicCounter.incrementAndGet() % size;
Channel channel = channelList.get(index);
int count = 0;
boolean isOk = channel.isActive() && channel.isWritable();
while (count++ < GET_AVALIABLE_CHANNEL_RETRY_COUNT) {
if (isOk) {
return channel;
}
index = (++index) % size;
channel = channelList.get(index);
isOk = channel.isActive() && channel.isWritable();
}
} else { } else {
log.warn("Check transaction failed, channel table is empty. groupId={}", groupId); log.warn("Check transaction failed, channel table is empty. groupId={}", groupId);
return null; return null;
} }
return null;
int size = channelList.size();
if (0 == size) {
log.warn("Channel list is empty. groupId={}", groupId);
return null;
}
Channel lastActiveChannel = null;
int index = positiveAtomicCounter.incrementAndGet() % size;
Channel channel = channelList.get(index);
int count = 0;
boolean isOk = channel.isActive() && channel.isWritable();
while (count++ < GET_AVALIABLE_CHANNEL_RETRY_COUNT) {
if (isOk) {
return channel;
}
if (channel.isActive()) {
lastActiveChannel = channel;
}
index = (++index) % size;
channel = channelList.get(index);
isOk = channel.isActive() && channel.isWritable();
}
return lastActiveChannel;
} }
public Channel findChannel(String clientId) { public Channel findChannel(String clientId) {
......
broker/src/main/java/org/apache/rocketmq/broker/processor/AdminBrokerProcessor.java
浏览文件 @ 958eb749
...@@ -815,7 +815,7 @@ public class AdminBrokerProcessor implements NettyRequestProcessor { ...@@ -815,7 +815,7 @@ public class AdminBrokerProcessor implements NettyRequestProcessor {
(GetProducerConnectionListRequestHeader) request.decodeCommandCustomHeader(GetProducerConnectionListRequestHeader.class); (GetProducerConnectionListRequestHeader) request.decodeCommandCustomHeader(GetProducerConnectionListRequestHeader.class);
ProducerConnection bodydata = new ProducerConnection(); ProducerConnection bodydata = new ProducerConnection();
HashMap<Channel, ClientChannelInfo> channelInfoHashMap = Map<Channel, ClientChannelInfo> channelInfoHashMap =
this.brokerController.getProducerManager().getGroupChannelTable().get(requestHeader.getProducerGroup()); this.brokerController.getProducerManager().getGroupChannelTable().get(requestHeader.getProducerGroup());
if (channelInfoHashMap != null) { if (channelInfoHashMap != null) {
Iterator<Map.Entry<Channel, ClientChannelInfo>> it = channelInfoHashMap.entrySet().iterator(); Iterator<Map.Entry<Channel, ClientChannelInfo>> it = channelInfoHashMap.entrySet().iterator();
......
broker/src/test/java/org/apache/rocketmq/broker/client/ProducerManagerTest.java
浏览文件 @ 958eb749
...@@ -19,7 +19,8 @@ package org.apache.rocketmq.broker.client; ...@@ -19,7 +19,8 @@ package org.apache.rocketmq.broker.client;
import io.netty.channel.Channel; import io.netty.channel.Channel;
import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelFuture;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.util.HashMap; import java.util.Map;
import org.apache.rocketmq.remoting.protocol.LanguageCode; import org.apache.rocketmq.remoting.protocol.LanguageCode;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
...@@ -74,7 +75,7 @@ public class ProducerManagerTest { ...@@ -74,7 +75,7 @@ public class ProducerManagerTest {
@Test @Test
public void testRegisterProducer() throws Exception { public void testRegisterProducer() throws Exception {
producerManager.registerProducer(group, clientInfo); producerManager.registerProducer(group, clientInfo);
HashMap<Channel, ClientChannelInfo> channelMap = producerManager.getGroupChannelTable().get(group); Map<Channel, ClientChannelInfo> channelMap = producerManager.getGroupChannelTable().get(group);
Channel channel1 = producerManager.findChannel("clientId"); Channel channel1 = producerManager.findChannel("clientId");
assertThat(channelMap).isNotNull(); assertThat(channelMap).isNotNull();
assertThat(channel1).isNotNull(); assertThat(channel1).isNotNull();
...@@ -85,7 +86,7 @@ public class ProducerManagerTest { ...@@ -85,7 +86,7 @@ public class ProducerManagerTest {
@Test @Test
public void unregisterProducer() throws Exception { public void unregisterProducer() throws Exception {
producerManager.registerProducer(group, clientInfo); producerManager.registerProducer(group, clientInfo);
HashMap<Channel, ClientChannelInfo> channelMap = producerManager.getGroupChannelTable().get(group); Map<Channel, ClientChannelInfo> channelMap = producerManager.getGroupChannelTable().get(group);
assertThat(channelMap).isNotNull(); assertThat(channelMap).isNotNull();
assertThat(channelMap.get(channel)).isEqualTo(clientInfo); assertThat(channelMap.get(channel)).isEqualTo(clientInfo);
Channel channel1 = producerManager.findChannel("clientId"); Channel channel1 = producerManager.findChannel("clientId");
...@@ -102,9 +103,28 @@ public class ProducerManagerTest { ...@@ -102,9 +103,28 @@ public class ProducerManagerTest {
@Test @Test
public void testGetGroupChannelTable() throws Exception { public void testGetGroupChannelTable() throws Exception {
producerManager.registerProducer(group, clientInfo); producerManager.registerProducer(group, clientInfo);
HashMap<Channel, ClientChannelInfo> oldMap = producerManager.getGroupChannelTable().get(group); Map<Channel, ClientChannelInfo> oldMap = producerManager.getGroupChannelTable().get(group);
producerManager.unregisterProducer(group, clientInfo); producerManager.unregisterProducer(group, clientInfo);
assertThat(oldMap.size()).isNotEqualTo(0); assertThat(oldMap.size()).isEqualTo(0);
} }
@Test
public void testGetAvaliableChannel() {
producerManager.registerProducer(group, clientInfo);
when(channel.isActive()).thenReturn(true);
when(channel.isWritable()).thenReturn(true);
Channel c = producerManager.getAvaliableChannel(group);
assertThat(c).isSameAs(channel);
when(channel.isWritable()).thenReturn(false);
c = producerManager.getAvaliableChannel(group);
assertThat(c).isSameAs(channel);
when(channel.isActive()).thenReturn(false);
c = producerManager.getAvaliableChannel(group);
assertThat(c).isNull();
}
} }
\ No newline at end of file
broker/src/test/java/org/apache/rocketmq/broker/processor/ClientManageProcessorTest.java
浏览文件 @ 958eb749
...@@ -19,6 +19,7 @@ package org.apache.rocketmq.broker.processor; ...@@ -19,6 +19,7 @@ package org.apache.rocketmq.broker.processor;
import io.netty.channel.Channel; import io.netty.channel.Channel;
import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelHandlerContext;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map;
import java.util.UUID; import java.util.UUID;
import org.apache.rocketmq.broker.BrokerController; import org.apache.rocketmq.broker.BrokerController;
import org.apache.rocketmq.broker.client.ClientChannelInfo; import org.apache.rocketmq.broker.client.ClientChannelInfo;
...@@ -81,7 +82,7 @@ public class ClientManageProcessorTest { ...@@ -81,7 +82,7 @@ public class ClientManageProcessorTest {
@Test @Test
public void processRequest_UnRegisterProducer() throws Exception { public void processRequest_UnRegisterProducer() throws Exception {
brokerController.getProducerManager().registerProducer(group, clientChannelInfo); brokerController.getProducerManager().registerProducer(group, clientChannelInfo);
HashMap<Channel, ClientChannelInfo> channelMap = brokerController.getProducerManager().getGroupChannelTable().get(group); Map<Channel, ClientChannelInfo> channelMap = brokerController.getProducerManager().getGroupChannelTable().get(group);
assertThat(channelMap).isNotNull(); assertThat(channelMap).isNotNull();
assertThat(channelMap.get(channel)).isEqualTo(clientChannelInfo); assertThat(channelMap.get(channel)).isEqualTo(clientChannelInfo);
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或