Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小五666\n哈哈
Rocketmq
提交
997164b1
R
Rocketmq
项目概览
小五666\n哈哈
/
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看板
未验证
提交
997164b1
编写于
2月 28, 2020
作者:
H
Heng Du
提交者:
GitHub
2月 28, 2020
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #1800 from Cczzzz/master
[ISSUE #1781]Fix asynchronous send retry
上级
64e4ca72
be67ff4a
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
7 addition
and
5 deletion
+7
-5
client/src/main/java/org/apache/rocketmq/client/impl/MQClientAPIImpl.java
...java/org/apache/rocketmq/client/impl/MQClientAPIImpl.java
+6
-4
remoting/src/main/java/org/apache/rocketmq/remoting/protocol/RemotingCommand.java
...rg/apache/rocketmq/remoting/protocol/RemotingCommand.java
+1
-1
未找到文件。
client/src/main/java/org/apache/rocketmq/client/impl/MQClientAPIImpl.java
浏览文件 @
997164b1
...
@@ -519,9 +519,11 @@ public class MQClientAPIImpl {
...
@@ -519,9 +519,11 @@ public class MQClientAPIImpl {
final
SendMessageContext
context
,
final
SendMessageContext
context
,
final
DefaultMQProducerImpl
producer
final
DefaultMQProducerImpl
producer
)
throws
InterruptedException
,
RemotingException
{
)
throws
InterruptedException
,
RemotingException
{
final
long
beginStartTime
=
System
.
currentTimeMillis
();
this
.
remotingClient
.
invokeAsync
(
addr
,
request
,
timeoutMillis
,
new
InvokeCallback
()
{
this
.
remotingClient
.
invokeAsync
(
addr
,
request
,
timeoutMillis
,
new
InvokeCallback
()
{
@Override
@Override
public
void
operationComplete
(
ResponseFuture
responseFuture
)
{
public
void
operationComplete
(
ResponseFuture
responseFuture
)
{
long
cost
=
System
.
currentTimeMillis
()
-
beginStartTime
;
RemotingCommand
response
=
responseFuture
.
getResponseCommand
();
RemotingCommand
response
=
responseFuture
.
getResponseCommand
();
if
(
null
==
sendCallback
&&
response
!=
null
)
{
if
(
null
==
sendCallback
&&
response
!=
null
)
{
...
@@ -555,23 +557,23 @@ public class MQClientAPIImpl {
...
@@ -555,23 +557,23 @@ public class MQClientAPIImpl {
producer
.
updateFaultItem
(
brokerName
,
System
.
currentTimeMillis
()
-
responseFuture
.
getBeginTimestamp
(),
false
);
producer
.
updateFaultItem
(
brokerName
,
System
.
currentTimeMillis
()
-
responseFuture
.
getBeginTimestamp
(),
false
);
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
producer
.
updateFaultItem
(
brokerName
,
System
.
currentTimeMillis
()
-
responseFuture
.
getBeginTimestamp
(),
true
);
producer
.
updateFaultItem
(
brokerName
,
System
.
currentTimeMillis
()
-
responseFuture
.
getBeginTimestamp
(),
true
);
onExceptionImpl
(
brokerName
,
msg
,
0L
,
request
,
sendCallback
,
topicPublishInfo
,
instance
,
onExceptionImpl
(
brokerName
,
msg
,
timeoutMillis
-
cost
,
request
,
sendCallback
,
topicPublishInfo
,
instance
,
retryTimesWhenSendFailed
,
times
,
e
,
context
,
false
,
producer
);
retryTimesWhenSendFailed
,
times
,
e
,
context
,
false
,
producer
);
}
}
}
else
{
}
else
{
producer
.
updateFaultItem
(
brokerName
,
System
.
currentTimeMillis
()
-
responseFuture
.
getBeginTimestamp
(),
true
);
producer
.
updateFaultItem
(
brokerName
,
System
.
currentTimeMillis
()
-
responseFuture
.
getBeginTimestamp
(),
true
);
if
(!
responseFuture
.
isSendRequestOK
())
{
if
(!
responseFuture
.
isSendRequestOK
())
{
MQClientException
ex
=
new
MQClientException
(
"send request failed"
,
responseFuture
.
getCause
());
MQClientException
ex
=
new
MQClientException
(
"send request failed"
,
responseFuture
.
getCause
());
onExceptionImpl
(
brokerName
,
msg
,
0L
,
request
,
sendCallback
,
topicPublishInfo
,
instance
,
onExceptionImpl
(
brokerName
,
msg
,
timeoutMillis
-
cost
,
request
,
sendCallback
,
topicPublishInfo
,
instance
,
retryTimesWhenSendFailed
,
times
,
ex
,
context
,
true
,
producer
);
retryTimesWhenSendFailed
,
times
,
ex
,
context
,
true
,
producer
);
}
else
if
(
responseFuture
.
isTimeout
())
{
}
else
if
(
responseFuture
.
isTimeout
())
{
MQClientException
ex
=
new
MQClientException
(
"wait response timeout "
+
responseFuture
.
getTimeoutMillis
()
+
"ms"
,
MQClientException
ex
=
new
MQClientException
(
"wait response timeout "
+
responseFuture
.
getTimeoutMillis
()
+
"ms"
,
responseFuture
.
getCause
());
responseFuture
.
getCause
());
onExceptionImpl
(
brokerName
,
msg
,
0L
,
request
,
sendCallback
,
topicPublishInfo
,
instance
,
onExceptionImpl
(
brokerName
,
msg
,
timeoutMillis
-
cost
,
request
,
sendCallback
,
topicPublishInfo
,
instance
,
retryTimesWhenSendFailed
,
times
,
ex
,
context
,
true
,
producer
);
retryTimesWhenSendFailed
,
times
,
ex
,
context
,
true
,
producer
);
}
else
{
}
else
{
MQClientException
ex
=
new
MQClientException
(
"unknow reseaon"
,
responseFuture
.
getCause
());
MQClientException
ex
=
new
MQClientException
(
"unknow reseaon"
,
responseFuture
.
getCause
());
onExceptionImpl
(
brokerName
,
msg
,
0L
,
request
,
sendCallback
,
topicPublishInfo
,
instance
,
onExceptionImpl
(
brokerName
,
msg
,
timeoutMillis
-
cost
,
request
,
sendCallback
,
topicPublishInfo
,
instance
,
retryTimesWhenSendFailed
,
times
,
ex
,
context
,
true
,
producer
);
retryTimesWhenSendFailed
,
times
,
ex
,
context
,
true
,
producer
);
}
}
}
}
...
...
remoting/src/main/java/org/apache/rocketmq/remoting/protocol/RemotingCommand.java
浏览文件 @
997164b1
...
@@ -188,7 +188,7 @@ public class RemotingCommand {
...
@@ -188,7 +188,7 @@ public class RemotingCommand {
}
}
public
static
int
createNewRequestId
()
{
public
static
int
createNewRequestId
()
{
return
requestId
.
incrementAndGe
t
();
return
requestId
.
getAndIncremen
t
();
}
}
public
static
SerializeType
getSerializeTypeConfigInThisServer
()
{
public
static
SerializeType
getSerializeTypeConfigInThisServer
()
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录