You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by du...@apache.org on 2019/01/25 03:15:24 UTC
[rocketmq] branch snode updated: Register snode pull message
controller for broker(ENode)
This is an automated email from the ASF dual-hosted git repository.
duhengforever pushed a commit to branch snode
in repository https://gitbox.apache.org/repos/asf/rocketmq.git
The following commit(s) were added to refs/heads/snode by this push:
new 64a2b0f Register snode pull message controller for broker(ENode)
64a2b0f is described below
commit 64a2b0f73dcd584efcacedd524f425d36f026820
Author: duhenglucky <du...@gmail.com>
AuthorDate: Fri Jan 25 11:14:41 2019 +0800
Register snode pull message controller for broker(ENode)
---
.../src/main/java/org/apache/rocketmq/broker/BrokerController.java | 4 ++--
.../org/apache/rocketmq/snode/client/ClientHousekeepingService.java | 5 ++++-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java b/broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java
index 4077bf4..1218956 100644
--- a/broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java
+++ b/broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java
@@ -513,8 +513,8 @@ public class BrokerController {
*/
this.remotingServer.registerProcessor(RequestCode.PULL_MESSAGE, this.pullMessageProcessor, this.pullMessageExecutor);
this.pullMessageProcessor.registerConsumeMessageHook(consumeMessageHookList);
-// this.remotingServer.registerProcessor(RequestCode.SNODE_PULL_MESSAGE, this.snodePullMessageProcessor, pullMessageExecutor);
-// this.snodePullMessageProcessor.registerConsumeMessageHook(consumeMessageHookList);
+ this.remotingServer.registerProcessor(RequestCode.SNODE_PULL_MESSAGE, this.snodePullMessageProcessor, pullMessageExecutor);
+ this.snodePullMessageProcessor.registerConsumeMessageHook(consumeMessageHookList);
/**
* QueryMessageProcessor
*/
diff --git a/snode/src/main/java/org/apache/rocketmq/snode/client/ClientHousekeepingService.java b/snode/src/main/java/org/apache/rocketmq/snode/client/ClientHousekeepingService.java
index 42ceacf..26112ef 100644
--- a/snode/src/main/java/org/apache/rocketmq/snode/client/ClientHousekeepingService.java
+++ b/snode/src/main/java/org/apache/rocketmq/snode/client/ClientHousekeepingService.java
@@ -54,7 +54,10 @@ public class ClientHousekeepingService implements ChannelEventListener {
Channel channel = ((NettyChannelImpl) remotingChannel).getChannel();
Attribute<Client> clientAttribute = channel.attr(SnodeConstant.NETTY_CLIENT_ATTRIBUTE_KEY);
if (clientAttribute != null) {
- return clientAttribute.get().getClientRole();
+ Client client = clientAttribute.get();
+ if (client != null) {
+ return client.getClientRole();
+ }
}
}
log.warn("RemotingChannel type error: {}", remotingChannel.getClass());