Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
转角邂逅
Rocketmq
提交
6e31d864
R
Rocketmq
项目概览
转角邂逅
/
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看板
体验新版 GitCode,发现更多精彩内容 >>
提交
6e31d864
编写于
1月 09, 2017
作者:
Y
yukon
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[ROCKETMQ-22] Resolve ClassCastException issue in printWaterMark.
上级
1562bd0d
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
69 addition
and
8 deletion
+69
-8
broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java
...ain/java/org/apache/rocketmq/broker/BrokerController.java
+1
-1
broker/src/main/java/org/apache/rocketmq/broker/latency/BrokerFastFailure.java
...org/apache/rocketmq/broker/latency/BrokerFastFailure.java
+2
-2
broker/src/main/java/org/apache/rocketmq/broker/longpolling/PullRequestHoldService.java
...e/rocketmq/broker/longpolling/PullRequestHoldService.java
+2
-2
broker/src/main/java/org/apache/rocketmq/broker/processor/PullMessageProcessor.java
...pache/rocketmq/broker/processor/PullMessageProcessor.java
+3
-3
broker/src/test/java/org/apache/rocketmq/broker/api/BrokerFastFailureTest.java
...org/apache/rocketmq/broker/api/BrokerFastFailureTest.java
+61
-0
未找到文件。
broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java
浏览文件 @
6e31d864
...
...
@@ -463,7 +463,7 @@ public class BrokerController {
final
Runnable
peek
=
q
.
peek
();
if
(
peek
!=
null
)
{
RequestTask
rt
=
BrokerFastFailure
.
castRunnable
(
peek
);
slowTimeMills
=
this
.
messageStore
.
now
()
-
rt
.
getCreateTimestamp
();
slowTimeMills
=
rt
==
null
?
0
:
this
.
messageStore
.
now
()
-
rt
.
getCreateTimestamp
();
}
if
(
slowTimeMills
<
0
)
...
...
broker/src/main/java/org/apache/rocketmq/broker/latency/BrokerFastFailure.java
浏览文件 @
6e31d864
...
...
@@ -71,7 +71,7 @@ public class BrokerFastFailure {
}
else
{
break
;
}
}
catch
(
Throwable
e
)
{
}
catch
(
Throwable
ignored
)
{
}
}
...
...
@@ -99,7 +99,7 @@ public class BrokerFastFailure {
}
else
{
break
;
}
}
catch
(
Throwable
e
)
{
}
catch
(
Throwable
ignored
)
{
}
}
}
...
...
broker/src/main/java/org/apache/rocketmq/broker/longpolling/PullRequestHoldService.java
浏览文件 @
6e31d864
...
...
@@ -130,7 +130,7 @@ public class PullRequestHoldService extends ServiceThread {
if
(
newestOffset
>
request
.
getPullFromThisOffset
())
{
if
(
this
.
messageFilter
.
isMessageMatched
(
request
.
getSubscriptionData
(),
tagsCode
))
{
try
{
this
.
brokerController
.
getPullMessageProcessor
().
excuteRequestWhenWakeup
(
request
.
getClientChannel
(),
this
.
brokerController
.
getPullMessageProcessor
().
ex
e
cuteRequestWhenWakeup
(
request
.
getClientChannel
(),
request
.
getRequestCommand
());
}
catch
(
Throwable
e
)
{
log
.
error
(
"execute request when wakeup failed."
,
e
);
...
...
@@ -141,7 +141,7 @@ public class PullRequestHoldService extends ServiceThread {
if
(
System
.
currentTimeMillis
()
>=
(
request
.
getSuspendTimestamp
()
+
request
.
getTimeoutMillis
()))
{
try
{
this
.
brokerController
.
getPullMessageProcessor
().
excuteRequestWhenWakeup
(
request
.
getClientChannel
(),
this
.
brokerController
.
getPullMessageProcessor
().
ex
e
cuteRequestWhenWakeup
(
request
.
getClientChannel
(),
request
.
getRequestCommand
());
}
catch
(
Throwable
e
)
{
log
.
error
(
"execute request when wakeup failed."
,
e
);
...
...
broker/src/main/java/org/apache/rocketmq/broker/processor/PullMessageProcessor.java
浏览文件 @
6e31d864
...
...
@@ -50,6 +50,7 @@ import org.apache.rocketmq.remoting.common.RemotingHelper;
import
org.apache.rocketmq.remoting.common.RemotingUtil
;
import
org.apache.rocketmq.remoting.exception.RemotingCommandException
;
import
org.apache.rocketmq.remoting.netty.NettyRequestProcessor
;
import
org.apache.rocketmq.remoting.netty.RequestTask
;
import
org.apache.rocketmq.remoting.protocol.RemotingCommand
;
import
org.apache.rocketmq.store.GetMessageResult
;
import
org.apache.rocketmq.store.MessageExtBrokerInner
;
...
...
@@ -481,7 +482,7 @@ public class PullMessageProcessor implements NettyRequestProcessor {
}
}
public
void
excuteRequestWhenWakeup
(
final
Channel
channel
,
final
RemotingCommand
request
)
throws
RemotingCommandException
{
public
void
ex
e
cuteRequestWhenWakeup
(
final
Channel
channel
,
final
RemotingCommand
request
)
throws
RemotingCommandException
{
Runnable
run
=
new
Runnable
()
{
@Override
public
void
run
()
{
...
...
@@ -513,8 +514,7 @@ public class PullMessageProcessor implements NettyRequestProcessor {
}
}
};
this
.
brokerController
.
getPullMessageExecutor
().
submit
(
run
);
this
.
brokerController
.
getPullMessageExecutor
().
submit
(
new
RequestTask
(
run
,
channel
,
request
));
}
public
void
registerConsumeMessageHook
(
List
<
ConsumeMessageHook
>
sendMessageHookList
)
{
...
...
broker/src/test/java/org/apache/rocketmq/broker/api/BrokerFastFailureTest.java
0 → 100644
浏览文件 @
6e31d864
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.apache.rocketmq.broker.api
;
import
java.util.concurrent.BlockingQueue
;
import
java.util.concurrent.LinkedBlockingQueue
;
import
java.util.concurrent.TimeUnit
;
import
org.apache.rocketmq.broker.BrokerTestHarness
;
import
org.apache.rocketmq.broker.latency.BrokerFastFailure
;
import
org.apache.rocketmq.broker.latency.FutureTaskExt
;
import
org.apache.rocketmq.remoting.netty.RequestTask
;
import
org.junit.Assert
;
import
org.junit.Test
;
public
class
BrokerFastFailureTest
extends
BrokerTestHarness
{
@Test
public
void
testHeadSlowTimeMills
()
throws
InterruptedException
{
BlockingQueue
<
Runnable
>
blockingQueue
=
new
LinkedBlockingQueue
<>();
blockingQueue
.
add
(
new
FutureTaskExt
<>(
new
RequestTask
(
null
,
null
,
null
),
null
));
TimeUnit
.
MILLISECONDS
.
sleep
(
10
);
Assert
.
assertTrue
(
this
.
brokerController
.
headSlowTimeMills
(
blockingQueue
)
>
0
);
blockingQueue
.
clear
();
blockingQueue
.
add
(
new
Runnable
()
{
@Override
public
void
run
()
{
}
});
Assert
.
assertTrue
(
this
.
brokerController
.
headSlowTimeMills
(
blockingQueue
)
==
0
);
}
@Test
public
void
testCastRunnable
()
{
Runnable
runnable
=
new
Runnable
()
{
@Override
public
void
run
()
{
}
};
Assert
.
assertNull
(
BrokerFastFailure
.
castRunnable
(
runnable
));
RequestTask
requestTask
=
new
RequestTask
(
null
,
null
,
null
);
runnable
=
new
FutureTaskExt
<>(
requestTask
,
null
);
Assert
.
assertEquals
(
requestTask
,
BrokerFastFailure
.
castRunnable
(
runnable
));
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录