Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Apache RocketMQ
Rocketmq
提交
d2345731
R
Rocketmq
项目概览
Apache RocketMQ
/
Rocketmq
上一次同步 大约 3 年
通知
267
Star
16139
Fork
68
代码
文件
提交
分支
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看板
提交
d2345731
编写于
11月 05, 2019
作者:
Z
zhenghu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[#1568] rocketmq need enhance stability when commitlog broken
增加非空判断,防止空指针异常,导致循环事务 check,增加test覆盖
上级
e8a0fea4
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
21 addition
and
0 deletion
+21
-0
broker/src/main/java/org/apache/rocketmq/broker/transaction/queue/TransactionalMessageBridge.java
.../broker/transaction/queue/TransactionalMessageBridge.java
+3
-0
broker/src/test/java/org/apache/rocketmq/broker/transaction/queue/TransactionalMessageBridgeTest.java
...ker/transaction/queue/TransactionalMessageBridgeTest.java
+18
-0
未找到文件。
broker/src/main/java/org/apache/rocketmq/broker/transaction/queue/TransactionalMessageBridge.java
浏览文件 @
d2345731
...
...
@@ -131,6 +131,9 @@ public class TransactionalMessageBridge {
this
.
brokerController
.
getBrokerStatsManager
().
incGroupGetSize
(
group
,
topic
,
getMessageResult
.
getBufferTotalSize
());
this
.
brokerController
.
getBrokerStatsManager
().
incBrokerGetNums
(
getMessageResult
.
getMessageCount
());
if
(
foundList
==
null
||
foundList
.
size
()
==
0
)
{
break
;
}
this
.
brokerController
.
getBrokerStatsManager
().
recordDiskFallBehindTime
(
group
,
topic
,
queueId
,
this
.
brokerController
.
getMessageStore
().
now
()
-
foundList
.
get
(
foundList
.
size
()
-
1
)
.
getStoreTimestamp
());
...
...
broker/src/test/java/org/apache/rocketmq/broker/transaction/queue/TransactionalMessageBridgeTest.java
浏览文件 @
d2345731
...
...
@@ -167,6 +167,24 @@ public class TransactionalMessageBridgeTest {
assertThat
(
messageExt
).
isNotNull
();
}
@Test
public
void
testGetHalfMessageStatusFound
()
{
when
(
messageStore
.
getMessage
(
anyString
(),
anyString
(),
anyInt
(),
anyLong
(),
anyInt
(),
ArgumentMatchers
.
nullable
(
MessageFilter
.
class
)))
.
thenReturn
(
createGetMessageResult
(
GetMessageStatus
.
FOUND
));
PullResult
result
=
transactionBridge
.
getHalfMessage
(
0
,
0
,
1
);
assertThat
(
result
.
getPullStatus
()).
isEqualTo
(
PullStatus
.
FOUND
);
}
@Test
public
void
testGetHalfMessageNull
()
{
when
(
messageStore
.
getMessage
(
anyString
(),
anyString
(),
anyInt
(),
anyLong
(),
anyInt
(),
ArgumentMatchers
.
nullable
(
MessageFilter
.
class
)))
.
thenReturn
(
null
);
PullResult
result
=
transactionBridge
.
getHalfMessage
(
0
,
0
,
1
);
assertThat
(
result
.
getPullStatus
()).
isNull
();
}
private
GetMessageResult
createGetMessageResult
(
GetMessageStatus
status
)
{
GetMessageResult
getMessageResult
=
new
GetMessageResult
();
getMessageResult
.
setStatus
(
status
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录