Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
码出高效码出未来
Rocketmq
提交
aea7461a
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,发现更多精彩内容 >>
未验证
提交
aea7461a
编写于
10月 27, 2018
作者:
Z
Zhendong Liu
提交者:
GitHub
10月 27, 2018
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'feature_acl' into develop-acl
上级
56f81dde
4915871c
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
92 addition
and
56 deletion
+92
-56
broker/src/main/java/org/apache/rocketmq/broker/plugin/AbstractPluginMessageStore.java
...he/rocketmq/broker/plugin/AbstractPluginMessageStore.java
+6
-0
broker/src/main/java/org/apache/rocketmq/broker/processor/AdminBrokerProcessor.java
...pache/rocketmq/broker/processor/AdminBrokerProcessor.java
+10
-2
common/src/test/java/org/apache/rocketmq/common/MixAllTest.java
.../src/test/java/org/apache/rocketmq/common/MixAllTest.java
+1
-1
pom.xml
pom.xml
+3
-17
remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyRemotingAbstract.java
...apache/rocketmq/remoting/netty/NettyRemotingAbstract.java
+46
-10
remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyRemotingClient.java
...g/apache/rocketmq/remoting/netty/NettyRemotingClient.java
+12
-20
remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyRemotingServer.java
...g/apache/rocketmq/remoting/netty/NettyRemotingServer.java
+5
-6
store/src/main/java/org/apache/rocketmq/store/DefaultMessageStore.java
...n/java/org/apache/rocketmq/store/DefaultMessageStore.java
+1
-0
store/src/main/java/org/apache/rocketmq/store/MessageStore.java
...src/main/java/org/apache/rocketmq/store/MessageStore.java
+8
-0
未找到文件。
broker/src/main/java/org/apache/rocketmq/broker/plugin/AbstractPluginMessageStore.java
浏览文件 @
aea7461a
...
...
@@ -30,6 +30,7 @@ import org.apache.rocketmq.store.MessageStore;
import
org.apache.rocketmq.store.PutMessageResult
;
import
org.apache.rocketmq.store.QueryMessageResult
;
import
org.apache.rocketmq.store.SelectMappedBufferResult
;
import
org.apache.rocketmq.store.stats.BrokerStatsManager
;
public
abstract
class
AbstractPluginMessageStore
implements
MessageStore
{
protected
MessageStore
next
=
null
;
...
...
@@ -246,4 +247,9 @@ public abstract class AbstractPluginMessageStore implements MessageStore {
public
ConsumeQueue
getConsumeQueue
(
String
topic
,
int
queueId
)
{
return
next
.
getConsumeQueue
(
topic
,
queueId
);
}
@Override
public
BrokerStatsManager
getBrokerStatsManager
()
{
return
next
.
getBrokerStatsManager
();
};
}
broker/src/main/java/org/apache/rocketmq/broker/processor/AdminBrokerProcessor.java
浏览文件 @
aea7461a
...
...
@@ -114,6 +114,7 @@ import org.apache.rocketmq.store.ConsumeQueue;
import
org.apache.rocketmq.store.ConsumeQueueExt
;
import
org.apache.rocketmq.store.DefaultMessageStore
;
import
org.apache.rocketmq.store.MessageFilter
;
import
org.apache.rocketmq.store.MessageStore
;
import
org.apache.rocketmq.store.SelectMappedBufferResult
;
public
class
AdminBrokerProcessor
implements
NettyRequestProcessor
{
...
...
@@ -760,12 +761,19 @@ public class AdminBrokerProcessor implements NettyRequestProcessor {
private
RemotingCommand
getAllDelayOffset
(
ChannelHandlerContext
ctx
,
RemotingCommand
request
)
{
final
RemotingCommand
response
=
RemotingCommand
.
createResponseCommand
(
null
);
if
(!(
this
.
brokerController
.
getMessageStore
()
instanceof
DefaultMessageStore
))
{
log
.
error
(
"Delay offset not supported in this messagetore, client: {} "
,
ctx
.
channel
().
remoteAddress
());
response
.
setCode
(
ResponseCode
.
SYSTEM_ERROR
);
response
.
setRemark
(
"Delay offset not supported in this messagetore"
);
return
response
;
}
String
content
=
((
DefaultMessageStore
)
this
.
brokerController
.
getMessageStore
()).
getScheduleMessageService
().
encode
();
if
(
content
!=
null
&&
content
.
length
()
>
0
)
{
try
{
response
.
setBody
(
content
.
getBytes
(
MixAll
.
DEFAULT_CHARSET
));
}
catch
(
UnsupportedEncodingException
e
)
{
log
.
error
(
"
g
et all delay offset from master error."
,
e
);
log
.
error
(
"
G
et all delay offset from master error."
,
e
);
response
.
setCode
(
ResponseCode
.
SYSTEM_ERROR
);
response
.
setRemark
(
"UnsupportedEncodingException "
+
e
);
...
...
@@ -1051,7 +1059,7 @@ public class AdminBrokerProcessor implements NettyRequestProcessor {
final
ViewBrokerStatsDataRequestHeader
requestHeader
=
(
ViewBrokerStatsDataRequestHeader
)
request
.
decodeCommandCustomHeader
(
ViewBrokerStatsDataRequestHeader
.
class
);
final
RemotingCommand
response
=
RemotingCommand
.
createResponseCommand
(
null
);
DefaultMessageStore
messageStore
=
(
DefaultMessageStore
)
this
.
brokerController
.
getMessageStore
();
MessageStore
messageStore
=
this
.
brokerController
.
getMessageStore
();
StatsItem
statsItem
=
messageStore
.
getBrokerStatsManager
().
getStatsItem
(
requestHeader
.
getStatsName
(),
requestHeader
.
getStatsKey
());
if
(
null
==
statsItem
)
{
...
...
common/src/test/java/org/apache/rocketmq/common/MixAllTest.java
浏览文件 @
aea7461a
...
...
@@ -33,7 +33,7 @@ public class MixAllTest {
List
<
String
>
localInetAddress
=
MixAll
.
getLocalInetAddress
();
String
local
=
InetAddress
.
getLocalHost
().
getHostAddress
();
assertThat
(
localInetAddress
).
contains
(
"127.0.0.1"
);
assertThat
(
local
).
isNotNull
();
}
@Test
...
...
pom.xml
浏览文件 @
aea7461a
...
...
@@ -323,6 +323,9 @@
<skipAfterFailureCount>
1
</skipAfterFailureCount>
<forkCount>
1
</forkCount>
<reuseForks>
true
</reuseForks>
<excludes>
<exclude>
**/IT*.java
</exclude>
</excludes>
</configuration>
</plugin>
<plugin>
...
...
@@ -335,23 +338,6 @@
<artifactId>
sonar-maven-plugin
</artifactId>
<version>
3.0.2
</version>
</plugin>
<plugin>
<artifactId>
maven-failsafe-plugin
</artifactId>
<version>
2.19.1
</version>
<configuration>
<skipAfterFailureCount>
1
</skipAfterFailureCount>
<excludes>
<exclude>
**/NormalMsgDelayIT.java
</exclude>
</excludes>
</configuration>
<executions>
<execution>
<goals>
<goal>
integration-test
</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
<pluginManagement>
...
...
remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyRemotingAbstract.java
浏览文件 @
aea7461a
...
...
@@ -23,6 +23,7 @@ import io.netty.channel.ChannelHandlerContext;
import
io.netty.handler.ssl.SslContext
;
import
io.netty.handler.ssl.SslHandler
;
import
java.net.SocketAddress
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
java.util.Iterator
;
import
java.util.LinkedList
;
...
...
@@ -95,6 +96,13 @@ public abstract class NettyRemotingAbstract {
*/
protected
volatile
SslContext
sslContext
;
/**
* custom rpc hooks
*/
protected
List
<
RPCHook
>
rpcHooks
=
new
ArrayList
<
RPCHook
>();
static
{
NettyLogger
.
initNettyLogger
();
}
...
...
@@ -158,6 +166,23 @@ public abstract class NettyRemotingAbstract {
}
}
protected
void
doBeforeRpcHooks
(
String
addr
,
RemotingCommand
request
)
{
if
(
rpcHooks
.
size
()
>
0
)
{
for
(
RPCHook
rpcHook:
rpcHooks
)
{
rpcHook
.
doBeforeRequest
(
addr
,
request
);
}
}
}
protected
void
doAfterRpcHooks
(
String
addr
,
RemotingCommand
request
,
RemotingCommand
response
)
{
if
(
rpcHooks
.
size
()
>
0
)
{
for
(
RPCHook
rpcHook:
rpcHooks
)
{
rpcHook
.
doAfterResponse
(
addr
,
request
,
response
);
}
}
}
/**
* Process incoming request command issued by remote peer.
*
...
...
@@ -174,15 +199,9 @@ public abstract class NettyRemotingAbstract {
@Override
public
void
run
()
{
try
{
RPCHook
rpcHook
=
NettyRemotingAbstract
.
this
.
getRPCHook
();
if
(
rpcHook
!=
null
)
{
rpcHook
.
doBeforeRequest
(
RemotingHelper
.
parseChannelRemoteAddr
(
ctx
.
channel
()),
cmd
);
}
doBeforeRpcHooks
(
RemotingHelper
.
parseChannelRemoteAddr
(
ctx
.
channel
()),
cmd
);
final
RemotingCommand
response
=
pair
.
getObject1
().
processRequest
(
ctx
,
cmd
);
if
(
rpcHook
!=
null
)
{
rpcHook
.
doAfterResponse
(
RemotingHelper
.
parseChannelRemoteAddr
(
ctx
.
channel
()),
cmd
,
response
);
}
doAfterRpcHooks
(
RemotingHelper
.
parseChannelRemoteAddr
(
ctx
.
channel
()),
cmd
,
response
);
if
(!
cmd
.
isOnewayRPC
())
{
if
(
response
!=
null
)
{
...
...
@@ -314,12 +333,29 @@ public abstract class NettyRemotingAbstract {
}
}
/**
* Custom RPC hook.
* Just be compatible with the previous version, use getRPCHooks instead.
*/
@Deprecated
protected
RPCHook
getRPCHook
()
{
if
(
rpcHooks
.
size
()
>
0
)
{
return
rpcHooks
.
get
(
0
);
}
return
null
;
}
/**
* Custom RPC hooks.
*
* @return RPC hook if specified; null otherwise.
* @return RPC hook
s
if specified; null otherwise.
*/
public
abstract
RPCHook
getRPCHook
();
public
List
<
RPCHook
>
getRPCHooks
()
{
return
rpcHooks
;
}
/**
* This method specifies thread pool to use while invoking callback methods.
...
...
remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyRemotingClient.java
浏览文件 @
aea7461a
...
...
@@ -34,6 +34,7 @@ import io.netty.handler.timeout.IdleState;
import
io.netty.handler.timeout.IdleStateEvent
;
import
io.netty.handler.timeout.IdleStateHandler
;
import
io.netty.util.concurrent.DefaultEventExecutorGroup
;
import
io.netty.util.concurrent.EventExecutorGroup
;
import
java.io.IOException
;
import
java.net.SocketAddress
;
import
java.security.cert.CertificateException
;
...
...
@@ -53,6 +54,8 @@ import java.util.concurrent.atomic.AtomicInteger;
import
java.util.concurrent.atomic.AtomicReference
;
import
java.util.concurrent.locks.Lock
;
import
java.util.concurrent.locks.ReentrantLock
;
import
org.apache.rocketmq.logging.InternalLogger
;
import
org.apache.rocketmq.logging.InternalLoggerFactory
;
import
org.apache.rocketmq.remoting.ChannelEventListener
;
import
org.apache.rocketmq.remoting.InvokeCallback
;
import
org.apache.rocketmq.remoting.RPCHook
;
...
...
@@ -64,8 +67,6 @@ import org.apache.rocketmq.remoting.exception.RemotingConnectException;
import
org.apache.rocketmq.remoting.exception.RemotingSendRequestException
;
import
org.apache.rocketmq.remoting.exception.RemotingTimeoutException
;
import
org.apache.rocketmq.remoting.exception.RemotingTooMuchRequestException
;
import
org.apache.rocketmq.logging.InternalLogger
;
import
org.apache.rocketmq.logging.InternalLoggerFactory
;
import
org.apache.rocketmq.remoting.protocol.RemotingCommand
;
public
class
NettyRemotingClient
extends
NettyRemotingAbstract
implements
RemotingClient
{
...
...
@@ -94,7 +95,6 @@ public class NettyRemotingClient extends NettyRemotingAbstract implements Remoti
private
ExecutorService
callbackExecutor
;
private
final
ChannelEventListener
channelEventListener
;
private
DefaultEventExecutorGroup
defaultEventExecutorGroup
;
private
RPCHook
rpcHook
;
public
NettyRemotingClient
(
final
NettyClientConfig
nettyClientConfig
)
{
this
(
nettyClientConfig
,
null
);
...
...
@@ -283,7 +283,9 @@ public class NettyRemotingClient extends NettyRemotingAbstract implements Remoti
@Override
public
void
registerRPCHook
(
RPCHook
rpcHook
)
{
this
.
rpcHook
=
rpcHook
;
if
(!
rpcHooks
.
contains
(
rpcHook
))
{
rpcHooks
.
add
(
rpcHook
);
}
}
public
void
closeChannel
(
final
Channel
channel
)
{
...
...
@@ -357,6 +359,8 @@ public class NettyRemotingClient extends NettyRemotingAbstract implements Remoti
}
}
@Override
public
RemotingCommand
invokeSync
(
String
addr
,
final
RemotingCommand
request
,
long
timeoutMillis
)
throws
InterruptedException
,
RemotingConnectException
,
RemotingSendRequestException
,
RemotingTimeoutException
{
...
...
@@ -364,17 +368,13 @@ public class NettyRemotingClient extends NettyRemotingAbstract implements Remoti
final
Channel
channel
=
this
.
getAndCreateChannel
(
addr
);
if
(
channel
!=
null
&&
channel
.
isActive
())
{
try
{
if
(
this
.
rpcHook
!=
null
)
{
this
.
rpcHook
.
doBeforeRequest
(
addr
,
request
);
}
doBeforeRpcHooks
(
addr
,
request
);
long
costTime
=
System
.
currentTimeMillis
()
-
beginStartTime
;
if
(
timeoutMillis
<
costTime
)
{
throw
new
RemotingTimeoutException
(
"invokeSync call timeout"
);
}
RemotingCommand
response
=
this
.
invokeSyncImpl
(
channel
,
request
,
timeoutMillis
-
costTime
);
if
(
this
.
rpcHook
!=
null
)
{
this
.
rpcHook
.
doAfterResponse
(
RemotingHelper
.
parseChannelRemoteAddr
(
channel
),
request
,
response
);
}
doAfterRpcHooks
(
RemotingHelper
.
parseChannelRemoteAddr
(
channel
),
request
,
response
);
return
response
;
}
catch
(
RemotingSendRequestException
e
)
{
log
.
warn
(
"invokeSync: send request exception, so close the channel[{}]"
,
addr
);
...
...
@@ -522,9 +522,7 @@ public class NettyRemotingClient extends NettyRemotingAbstract implements Remoti
final
Channel
channel
=
this
.
getAndCreateChannel
(
addr
);
if
(
channel
!=
null
&&
channel
.
isActive
())
{
try
{
if
(
this
.
rpcHook
!=
null
)
{
this
.
rpcHook
.
doBeforeRequest
(
addr
,
request
);
}
doBeforeRpcHooks
(
addr
,
request
);
long
costTime
=
System
.
currentTimeMillis
()
-
beginStartTime
;
if
(
timeoutMillis
<
costTime
)
{
throw
new
RemotingTooMuchRequestException
(
"invokeAsync call timeout"
);
...
...
@@ -547,9 +545,7 @@ public class NettyRemotingClient extends NettyRemotingAbstract implements Remoti
final
Channel
channel
=
this
.
getAndCreateChannel
(
addr
);
if
(
channel
!=
null
&&
channel
.
isActive
())
{
try
{
if
(
this
.
rpcHook
!=
null
)
{
this
.
rpcHook
.
doBeforeRequest
(
addr
,
request
);
}
doBeforeRpcHooks
(
addr
,
request
);
this
.
invokeOnewayImpl
(
channel
,
request
,
timeoutMillis
);
}
catch
(
RemotingSendRequestException
e
)
{
log
.
warn
(
"invokeOneway: send request exception, so close the channel[{}]"
,
addr
);
...
...
@@ -592,10 +588,6 @@ public class NettyRemotingClient extends NettyRemotingAbstract implements Remoti
return
channelEventListener
;
}
@Override
public
RPCHook
getRPCHook
()
{
return
this
.
rpcHook
;
}
@Override
public
ExecutorService
getCallbackExecutor
()
{
...
...
remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyRemotingServer.java
浏览文件 @
aea7461a
...
...
@@ -40,6 +40,8 @@ import io.netty.util.concurrent.DefaultEventExecutorGroup;
import
java.io.IOException
;
import
java.net.InetSocketAddress
;
import
java.security.cert.CertificateException
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.NoSuchElementException
;
import
java.util.Timer
;
import
java.util.TimerTask
;
...
...
@@ -75,7 +77,6 @@ public class NettyRemotingServer extends NettyRemotingAbstract implements Remoti
private
final
Timer
timer
=
new
Timer
(
"ServerHouseKeepingService"
,
true
);
private
DefaultEventExecutorGroup
defaultEventExecutorGroup
;
private
RPCHook
rpcHook
;
private
int
port
=
0
;
...
...
@@ -266,7 +267,9 @@ public class NettyRemotingServer extends NettyRemotingAbstract implements Remoti
@Override
public
void
registerRPCHook
(
RPCHook
rpcHook
)
{
this
.
rpcHook
=
rpcHook
;
if
(!
rpcHooks
.
contains
(
rpcHook
))
{
rpcHooks
.
add
(
rpcHook
);
}
}
@Override
...
...
@@ -318,10 +321,6 @@ public class NettyRemotingServer extends NettyRemotingAbstract implements Remoti
return
channelEventListener
;
}
@Override
public
RPCHook
getRPCHook
()
{
return
this
.
rpcHook
;
}
@Override
public
ExecutorService
getCallbackExecutor
()
{
...
...
store/src/main/java/org/apache/rocketmq/store/DefaultMessageStore.java
浏览文件 @
aea7461a
...
...
@@ -1371,6 +1371,7 @@ public class DefaultMessageStore implements MessageStore {
cq
.
putMessagePositionInfoWrapper
(
dispatchRequest
);
}
@Override
public
BrokerStatsManager
getBrokerStatsManager
()
{
return
brokerStatsManager
;
}
...
...
store/src/main/java/org/apache/rocketmq/store/MessageStore.java
浏览文件 @
aea7461a
...
...
@@ -21,6 +21,7 @@ import java.util.LinkedList;
import
java.util.Set
;
import
org.apache.rocketmq.common.message.MessageExt
;
import
org.apache.rocketmq.common.message.MessageExtBatch
;
import
org.apache.rocketmq.store.stats.BrokerStatsManager
;
/**
* This class defines contracting interfaces to implement, allowing third-party vendor to use customized message store.
...
...
@@ -358,4 +359,11 @@ public interface MessageStore {
* @return Consume queue.
*/
ConsumeQueue
getConsumeQueue
(
String
topic
,
int
queueId
);
/**
* Get BrokerStatsManager of the messageStore.
*
* @return BrokerStatsManager.
*/
BrokerStatsManager
getBrokerStatsManager
();
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录