Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Lion Long
Rocketmq
提交
5a19e6ee
R
Rocketmq
项目概览
Lion Long
/
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看板
体验新版 GitCode,发现更多精彩内容 >>
提交
5a19e6ee
编写于
11月 14, 2018
作者:
D
dongeforever
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix reput problem
上级
84bd6409
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
16 addition
and
12 deletion
+16
-12
store/src/main/java/org/apache/rocketmq/store/DefaultMessageStore.java
...n/java/org/apache/rocketmq/store/DefaultMessageStore.java
+3
-5
store/src/main/java/org/apache/rocketmq/store/dleger/DLegerCommitLog.java
...ava/org/apache/rocketmq/store/dleger/DLegerCommitLog.java
+13
-7
未找到文件。
store/src/main/java/org/apache/rocketmq/store/DefaultMessageStore.java
浏览文件 @
5a19e6ee
...
...
@@ -1817,12 +1817,10 @@ public class DefaultMessageStore implements MessageStore {
this
.
reputFromOffset
+=
size
;
}
else
{
doNext
=
false
;
if
(
DefaultMessageStore
.
this
.
brokerConfig
.
getBrokerId
()
==
MixAll
.
MASTER_ID
)
{
log
.
error
(
"[BUG]the master dispatch message to consume queue error, COMMITLOG OFFSET: {}"
,
this
.
reputFromOffset
);
log
.
error
(
"[BUG]dispatch message to consume queue error, COMMITLOG OFFSET: {}"
,
this
.
reputFromOffset
);
this
.
reputFromOffset
+=
result
.
getSize
()
-
readSize
;
}
this
.
reputFromOffset
+=
result
.
getSize
()
-
readSize
;
}
}
}
...
...
store/src/main/java/org/apache/rocketmq/store/dleger/DLegerCommitLog.java
浏览文件 @
5a19e6ee
...
...
@@ -227,14 +227,20 @@ public class DLegerCommitLog extends CommitLog {
final
boolean
readBody
)
{
try
{
int
bodyOffset
=
DLegerEntry
.
BODY_OFFSET
;
byteBuffer
.
position
(
byteBuffer
.
position
()
+
bodyOffset
);
DispatchRequest
dispatchRequest
=
super
.
checkMessageAndReturnSize
(
byteBuffer
,
checkCRC
,
readBody
);
if
(
dispatchRequest
.
isSuccess
())
{
dispatchRequest
.
setBufferSize
(
dispatchRequest
.
getMsgSize
()
+
bodyOffset
);
}
else
if
(
dispatchRequest
.
getMsgSize
()
>
0
)
{
dispatchRequest
.
setBufferSize
(
dispatchRequest
.
getMsgSize
()
+
bodyOffset
);
int
pos
=
byteBuffer
.
position
();
int
magic
=
byteBuffer
.
getInt
();
if
(
magic
==
MmapFileList
.
BLANK_MAGIC_CODE
)
{
return
new
DispatchRequest
(
0
,
true
);
}
else
{
byteBuffer
.
position
(
pos
+
bodyOffset
);
DispatchRequest
dispatchRequest
=
super
.
checkMessageAndReturnSize
(
byteBuffer
,
checkCRC
,
readBody
);
if
(
dispatchRequest
.
isSuccess
())
{
dispatchRequest
.
setBufferSize
(
dispatchRequest
.
getMsgSize
()
+
bodyOffset
);
}
else
if
(
dispatchRequest
.
getMsgSize
()
>
0
)
{
dispatchRequest
.
setBufferSize
(
dispatchRequest
.
getMsgSize
()
+
bodyOffset
);
}
return
dispatchRequest
;
}
return
dispatchRequest
;
}
catch
(
Exception
e
)
{
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录