Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Kwan的解忧杂货铺@新空间代码工作室
Rocketmq
提交
74565fdd
R
Rocketmq
项目概览
Kwan的解忧杂货铺@新空间代码工作室
/
Rocketmq
与 Fork 源项目一致
Fork自
Apache RocketMQ / Rocketmq
通知
1
Star
0
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看板
提交
74565fdd
编写于
12月 02, 2021
作者:
D
dongeforever
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix the computePullFromWhereWithException
上级
fad17e1e
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
18 addition
and
4 deletion
+18
-4
broker/src/main/java/org/apache/rocketmq/broker/processor/PullMessageProcessor.java
...pache/rocketmq/broker/processor/PullMessageProcessor.java
+3
-1
client/src/main/java/org/apache/rocketmq/client/impl/consumer/DefaultMQPushConsumerImpl.java
...ketmq/client/impl/consumer/DefaultMQPushConsumerImpl.java
+4
-0
client/src/main/java/org/apache/rocketmq/client/impl/consumer/RebalancePushImpl.java
...ache/rocketmq/client/impl/consumer/RebalancePushImpl.java
+11
-3
未找到文件。
broker/src/main/java/org/apache/rocketmq/broker/processor/PullMessageProcessor.java
浏览文件 @
74565fdd
...
...
@@ -200,6 +200,7 @@ public class PullMessageProcessor extends AsyncNettyRequestProcessor implements
//actually, we need do nothing, but keep the code structure here
if
(
code
==
ResponseCode
.
PULL_OFFSET_MOVED
)
{
responseCode
=
ResponseCode
.
PULL_OFFSET_MOVED
;
nextBeginOffset
=
maxOffset
;
}
else
{
//maybe current broker is the slave
responseCode
=
code
;
...
...
@@ -217,11 +218,12 @@ public class PullMessageProcessor extends AsyncNettyRequestProcessor implements
if
(
requestOffset
<
minOffset
)
{
if
(
code
==
ResponseCode
.
PULL_OFFSET_MOVED
)
{
responseCode
=
ResponseCode
.
PULL_OFFSET_MOVED
;
nextBeginOffset
=
minOffset
;
}
else
{
//maybe read from slave, but we still set it to moved
responseCode
=
ResponseCode
.
PULL_OFFSET_MOVED
;
nextBeginOffset
=
minOffset
;
}
nextBeginOffset
=
minOffset
;
}
else
if
(
requestOffset
>=
maxOffset
)
{
//just move to another item
LogicQueueMappingItem
nextItem
=
TopicQueueMappingUtils
.
findNext
(
mappingContext
.
getMappingItemList
(),
currentItem
,
true
);
...
...
client/src/main/java/org/apache/rocketmq/client/impl/consumer/DefaultMQPushConsumerImpl.java
浏览文件 @
74565fdd
...
...
@@ -72,6 +72,7 @@ import org.apache.rocketmq.common.message.MessageConst;
import
org.apache.rocketmq.common.message.MessageExt
;
import
org.apache.rocketmq.common.message.MessageQueue
;
import
org.apache.rocketmq.common.protocol.NamespaceUtil
;
import
org.apache.rocketmq.common.protocol.ResponseCode
;
import
org.apache.rocketmq.common.protocol.body.ConsumeStatus
;
import
org.apache.rocketmq.common.protocol.body.ConsumerRunningInfo
;
import
org.apache.rocketmq.common.protocol.body.PopProcessQueueInfo
;
...
...
@@ -297,6 +298,9 @@ public class DefaultMQPushConsumerImpl implements MQConsumerInner {
long
offset
=
-
1L
;
try
{
offset
=
this
.
rebalanceImpl
.
computePullFromWhereWithException
(
pullRequest
.
getMessageQueue
());
if
(
offset
<
0
)
{
throw
new
MQClientException
(
ResponseCode
.
SYSTEM_ERROR
,
"Unexpected offset "
+
offset
);
}
}
catch
(
Exception
e
)
{
this
.
executePullRequestLater
(
pullRequest
,
pullTimeDelayMillsWhenException
);
log
.
error
(
"Failed to compute pull offset, pullResult: {}"
,
pullRequest
,
e
);
...
...
client/src/main/java/org/apache/rocketmq/client/impl/consumer/RebalancePushImpl.java
浏览文件 @
74565fdd
...
...
@@ -189,7 +189,8 @@ public class RebalancePushImpl extends RebalanceImpl {
}
}
}
else
{
result
=
-
1
;
throw
new
MQClientException
(
ResponseCode
.
QUERY_NOT_FOUND
,
"Failed to query consume offset from "
+
"offset store"
);
}
break
;
}
...
...
@@ -198,9 +199,11 @@ public class RebalancePushImpl extends RebalanceImpl {
if
(
lastOffset
>=
0
)
{
result
=
lastOffset
;
}
else
if
(-
1
==
lastOffset
)
{
//the offset will be fixed by the OFFSET_ILLEGAL process
result
=
0L
;
}
else
{
result
=
-
1
;
throw
new
MQClientException
(
ResponseCode
.
QUERY_NOT_FOUND
,
"Failed to query offset from offset "
+
"store"
);
}
break
;
}
...
...
@@ -227,7 +230,8 @@ public class RebalancePushImpl extends RebalanceImpl {
}
}
}
else
{
result
=
-
1
;
throw
new
MQClientException
(
ResponseCode
.
QUERY_NOT_FOUND
,
"Failed to query offset from offset "
+
"store"
);
}
break
;
}
...
...
@@ -236,6 +240,10 @@ public class RebalancePushImpl extends RebalanceImpl {
break
;
}
if
(
result
<
0
)
{
throw
new
MQClientException
(
ResponseCode
.
SYSTEM_ERROR
,
"Found unexpected result "
+
result
);
}
return
result
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录