Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
s920243400
Rocketmq
提交
cf8b8465
R
Rocketmq
项目概览
s920243400
/
Rocketmq
与 Fork 源项目一致
Fork自
Apache RocketMQ / Rocketmq
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
Rocketmq
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
提交
cf8b8465
编写于
11月 20, 2021
作者:
D
dongeforever
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Polish the lock and persist for updateTopicQueueMapping
上级
d18d787f
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
20 addition
and
5 deletion
+20
-5
broker/src/main/java/org/apache/rocketmq/broker/processor/AdminBrokerProcessor.java
...pache/rocketmq/broker/processor/AdminBrokerProcessor.java
+1
-1
broker/src/main/java/org/apache/rocketmq/broker/topic/TopicQueueMappingManager.java
...pache/rocketmq/broker/topic/TopicQueueMappingManager.java
+19
-4
未找到文件。
broker/src/main/java/org/apache/rocketmq/broker/processor/AdminBrokerProcessor.java
浏览文件 @
cf8b8465
...
...
@@ -343,7 +343,7 @@ public class AdminBrokerProcessor extends AsyncNettyRequestProcessor implements
this
.
brokerController
.
registerIncrementBrokerData
(
topicConfig
,
this
.
brokerController
.
getTopicConfigManager
().
getDataVersion
());
response
.
setCode
(
ResponseCode
.
SUCCESS
);
}
catch
(
Exception
e
)
{
log
.
error
(
"Update static failed for [{}]"
,
request
,
e
);
log
.
error
(
"Update static
topic
failed for [{}]"
,
request
,
e
);
response
.
setCode
(
ResponseCode
.
SYSTEM_ERROR
);
response
.
setRemark
(
e
.
getMessage
());
}
...
...
broker/src/main/java/org/apache/rocketmq/broker/topic/TopicQueueMappingManager.java
浏览文件 @
cf8b8465
...
...
@@ -36,6 +36,7 @@ import org.apache.rocketmq.remoting.protocol.RemotingCommand;
import
java.util.concurrent.ConcurrentHashMap
;
import
java.util.concurrent.ConcurrentMap
;
import
java.util.concurrent.TimeUnit
;
import
java.util.concurrent.locks.Lock
;
import
java.util.concurrent.locks.ReentrantLock
;
...
...
@@ -57,9 +58,15 @@ public class TopicQueueMappingManager extends ConfigManager {
this
.
brokerController
=
brokerController
;
}
public
void
updateTopicQueueMapping
(
TopicQueueMappingDetail
newDetail
,
boolean
force
)
{
lock
.
lock
();
public
void
updateTopicQueueMapping
(
TopicQueueMappingDetail
newDetail
,
boolean
force
)
throws
Exception
{
boolean
locked
=
false
;
boolean
updated
=
false
;
try
{
if
(
lock
.
tryLock
(
LOCK_TIMEOUT_MILLIS
,
TimeUnit
.
MILLISECONDS
))
{
locked
=
true
;
}
else
{
return
;
}
if
(
newDetail
==
null
)
{
return
;
}
...
...
@@ -70,6 +77,7 @@ public class TopicQueueMappingManager extends ConfigManager {
TopicQueueMappingDetail
oldDetail
=
topicQueueMappingTable
.
get
(
newDetail
.
getTopic
());
if
(
oldDetail
==
null
)
{
topicQueueMappingTable
.
put
(
newDetail
.
getTopic
(),
newDetail
);
updated
=
true
;
return
;
}
if
(
force
)
{
...
...
@@ -77,6 +85,7 @@ public class TopicQueueMappingManager extends ConfigManager {
newDetail
.
getHostedQueues
().
putIfAbsent
(
queueId
,
items
);
});
topicQueueMappingTable
.
put
(
newDetail
.
getTopic
(),
newDetail
);
updated
=
true
;
return
;
}
//do more check
...
...
@@ -94,8 +103,14 @@ public class TopicQueueMappingManager extends ConfigManager {
}
}
topicQueueMappingTable
.
put
(
newDetail
.
getTopic
(),
newDetail
);
}
finally
{
lock
.
unlock
();
updated
=
true
;
}
finally
{
if
(
locked
)
{
this
.
lock
.
unlock
();
}
if
(
updated
)
{
this
.
persist
();
}
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录