Skip to content

Commit

Permalink
Remove unused class GetRouteInfoResponseHeader and meaningless comments
Browse files Browse the repository at this point in the history
  • Loading branch information
@zhouxinyu
zhouxinyu committed Aug 11, 2017
1 parent ffad656 commit 7f96008
Show file tree
Hide file tree
Showing 62 changed files with 617 additions and 781 deletions.
11 changes: 5 additions & 6 deletions broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,11 +135,11 @@ public class BrokerController {
private BrokerFastFailure brokerFastFailure;
private Configuration configuration;

public BrokerController(//
final BrokerConfig brokerConfig, //
final NettyServerConfig nettyServerConfig, //
final NettyClientConfig nettyClientConfig, //
final MessageStoreConfig messageStoreConfig //
public BrokerController(
final BrokerConfig brokerConfig,
final NettyServerConfig nettyServerConfig,
final NettyClientConfig nettyClientConfig,
final MessageStoreConfig messageStoreConfig
) {
this.brokerConfig = brokerConfig;
this.nettyServerConfig = nettyServerConfig;
Expand Down Expand Up @@ -255,7 +255,6 @@ public boolean initialize() throws CloneNotSupportedException {

this.registerProcessor();

// TODO remove in future
final long initialDelay = UtilAll.computNextMorningTimeMillis() - System.currentTimeMillis();
final long period = 1000 * 60 * 60 * 24;
this.scheduledExecutorService.scheduleAtFixedRate(new Runnable() {
Expand Down
8 changes: 4 additions & 4 deletions broker/src/main/java/org/apache/rocketmq/broker/BrokerStartup.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,10 +190,10 @@ public static BrokerController createBrokerController(String[] args) {
MixAll.printObjectProperties(log, nettyClientConfig);
MixAll.printObjectProperties(log, messageStoreConfig);

final BrokerController controller = new BrokerController(//
brokerConfig, //
nettyServerConfig, //
nettyClientConfig, //
final BrokerController controller = new BrokerController(
brokerConfig,
nettyServerConfig,
nettyClientConfig,
messageStoreConfig);
// remember all configs to prevent discard
controller.getConfiguration().registerConfig(properties);
Expand Down
44 changes: 22 additions & 22 deletions broker/src/main/java/org/apache/rocketmq/broker/client/rebalance/RebalanceLockManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ public boolean tryLock(final String group, final MessageQueue mq, final String c
lockEntry = new LockEntry();
lockEntry.setClientId(clientId);
groupValue.put(mq, lockEntry);
log.info("tryLock, message queue not locked, I got it. Group: {} NewClientId: {} {}", //
group, //
clientId, //
log.info("tryLock, message queue not locked, I got it. Group: {} NewClientId: {} {}",
group,
clientId,
mq);
}

Expand All @@ -69,19 +69,19 @@ public boolean tryLock(final String group, final MessageQueue mq, final String c
lockEntry.setClientId(clientId);
lockEntry.setLastUpdateTimestamp(System.currentTimeMillis());
log.warn(
"tryLock, message queue lock expired, I got it. Group: {} OldClientId: {} NewClientId: {} {}", //
group, //
oldClientId, //
clientId, //
"tryLock, message queue lock expired, I got it. Group: {} OldClientId: {} NewClientId: {} {}",
group,
oldClientId,
clientId,
mq);
return true;
}

log.warn(
"tryLock, message queue locked by other client. Group: {} OtherClientId: {} NewClientId: {} {}", //
group, //
oldClientId, //
clientId, //
"tryLock, message queue locked by other client. Group: {} OtherClientId: {} NewClientId: {} {}",
group,
oldClientId,
clientId,
mq);
return false;
} finally {
Expand Down Expand Up @@ -144,9 +144,9 @@ public Set<MessageQueue> tryLockBatch(final String group, final Set<MessageQueue
lockEntry.setClientId(clientId);
groupValue.put(mq, lockEntry);
log.info(
"tryLockBatch, message queue not locked, I got it. Group: {} NewClientId: {} {}", //
group, //
clientId, //
"tryLockBatch, message queue not locked, I got it. Group: {} NewClientId: {} {}",
group,
clientId,
mq);
}

Expand All @@ -162,20 +162,20 @@ public Set<MessageQueue> tryLockBatch(final String group, final Set<MessageQueue
lockEntry.setClientId(clientId);
lockEntry.setLastUpdateTimestamp(System.currentTimeMillis());
log.warn(
"tryLockBatch, message queue lock expired, I got it. Group: {} OldClientId: {} NewClientId: {} {}", //
group, //
oldClientId, //
clientId, //
"tryLockBatch, message queue lock expired, I got it. Group: {} OldClientId: {} NewClientId: {} {}",
group,
oldClientId,
clientId,
mq);
lockedMqs.add(mq);
continue;
}

log.warn(
"tryLockBatch, message queue locked by other client. Group: {} OtherClientId: {} NewClientId: {} {}", //
group, //
oldClientId, //
clientId, //
"tryLockBatch, message queue locked by other client. Group: {} OtherClientId: {} NewClientId: {} {}",
group,
oldClientId,
clientId,
mq);
}
} finally {
Expand Down
2 changes: 0 additions & 2 deletions broker/src/main/java/org/apache/rocketmq/broker/filtersrv/FilterServerManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,7 @@ public void registerFilterServer(final Channel channel, final String filterServe
}
}

/**

*/
public void scanNotActiveChannel() {

Iterator<Entry<Channel, FilterServerInfo>> it = this.filterServerTable.entrySet().iterator();
Expand Down
8 changes: 4 additions & 4 deletions broker/src/main/java/org/apache/rocketmq/broker/processor/AbstractSendMessageProcessor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,10 +189,10 @@ protected RemotingCommand msgCheck(final ChannelHandlerContext ctx,
}

log.warn("the topic {} not exist, producer: {}", requestHeader.getTopic(), ctx.channel().remoteAddress());
topicConfig = this.brokerController.getTopicConfigManager().createTopicInSendMessageMethod(//
requestHeader.getTopic(), //
requestHeader.getDefaultTopic(), //
RemotingHelper.parseChannelRemoteAddr(ctx.channel()), //
topicConfig = this.brokerController.getTopicConfigManager().createTopicInSendMessageMethod(
requestHeader.getTopic(),
requestHeader.getDefaultTopic(),
RemotingHelper.parseChannelRemoteAddr(ctx.channel()),
requestHeader.getDefaultTopicQueueNums(), topicSysFlag);

if (null == topicConfig) {
Expand Down
49 changes: 21 additions & 28 deletions broker/src/main/java/org/apache/rocketmq/broker/processor/AdminBrokerProcessor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;


public class AdminBrokerProcessor implements NettyRequestProcessor {
private static final Logger log = LoggerFactory.getLogger(LoggerName.BROKER_LOGGER_NAME);
private final BrokerController brokerController;
Expand Down Expand Up @@ -432,9 +433,9 @@ private RemotingCommand lockBatchMQ(ChannelHandlerContext ctx, RemotingCommand r
final RemotingCommand response = RemotingCommand.createResponseCommand(null);
LockBatchRequestBody requestBody = LockBatchRequestBody.decode(request.getBody(), LockBatchRequestBody.class);

Set<MessageQueue> lockOKMQSet = this.brokerController.getRebalanceLockManager().tryLockBatch(//
requestBody.getConsumerGroup(), //
requestBody.getMqSet(), //
Set<MessageQueue> lockOKMQSet = this.brokerController.getRebalanceLockManager().tryLockBatch(
requestBody.getConsumerGroup(),
requestBody.getMqSet(),
requestBody.getClientId());

LockBatchResponseBody responseBody = new LockBatchResponseBody();
Expand All @@ -450,9 +451,9 @@ private RemotingCommand unlockBatchMQ(ChannelHandlerContext ctx, RemotingCommand
final RemotingCommand response = RemotingCommand.createResponseCommand(null);
UnlockBatchRequestBody requestBody = UnlockBatchRequestBody.decode(request.getBody(), UnlockBatchRequestBody.class);

this.brokerController.getRebalanceLockManager().unlockBatch(//
requestBody.getConsumerGroup(), //
requestBody.getMqSet(), //
this.brokerController.getRebalanceLockManager().unlockBatch(
requestBody.getConsumerGroup(),
requestBody.getMqSet(),
requestBody.getClientId());

response.setCode(ResponseCode.SUCCESS);
Expand Down Expand Up @@ -657,14 +658,12 @@ private RemotingCommand getConsumeStats(ChannelHandlerContext ctx, RemotingComma
continue;
}

/**

*/
{
SubscriptionData findSubscriptionData =
this.brokerController.getConsumerManager().findSubscriptionData(requestHeader.getConsumerGroup(), topic);

if (null == findSubscriptionData //
if (null == findSubscriptionData
&& this.brokerController.getConsumerManager().findSubscriptionDataCount(requestHeader.getConsumerGroup()) > 0) {
log.warn("consumeStats, the consumer group[{}], topic[{}] not exist", requestHeader.getConsumerGroup(), topic);
continue;
Expand All @@ -683,9 +682,9 @@ private RemotingCommand getConsumeStats(ChannelHandlerContext ctx, RemotingComma
if (brokerOffset < 0)
brokerOffset = 0;

long consumerOffset = this.brokerController.getConsumerOffsetManager().queryOffset(//
requestHeader.getConsumerGroup(), //
topic, //
long consumerOffset = this.brokerController.getConsumerOffsetManager().queryOffset(
requestHeader.getConsumerGroup(),
topic,
i);
if (consumerOffset < 0)
consumerOffset = 0;
Expand Down Expand Up @@ -925,9 +924,7 @@ public RemotingCommand cleanUnusedTopic() {
return response;
}

/**

*/
private RemotingCommand getConsumerRunningInfo(ChannelHandlerContext ctx, RemotingCommand request) throws RemotingCommandException {
final GetConsumerRunningInfoRequestHeader requestHeader =
(GetConsumerRunningInfoRequestHeader) request.decodeCommandCustomHeader(GetConsumerRunningInfoRequestHeader.class);
Expand Down Expand Up @@ -1007,9 +1004,7 @@ private RemotingCommand cloneGroupOffset(ChannelHandlerContext ctx, RemotingComm
continue;
}

/**

*/
if (!requestHeader.isOffline()) {

SubscriptionData findSubscriptionData =
Expand Down Expand Up @@ -1107,13 +1102,11 @@ private RemotingCommand fetchAllConsumeStatsInBroker(ChannelHandlerContext ctx,
if (isOrder && !topicConfig.isOrder()) {
continue;
}
/**

*/
{
SubscriptionData findSubscriptionData = this.brokerController.getConsumerManager().findSubscriptionData(group, topic);

if (null == findSubscriptionData //
if (null == findSubscriptionData
&& this.brokerController.getConsumerManager().findSubscriptionDataCount(group) > 0) {
log.warn("consumeStats, the consumer group[{}], topic[{}] not exist", group, topic);
continue;
Expand All @@ -1129,9 +1122,9 @@ private RemotingCommand fetchAllConsumeStatsInBroker(ChannelHandlerContext ctx,
long brokerOffset = this.brokerController.getMessageStore().getMaxOffsetInQueue(topic, i);
if (brokerOffset < 0)
brokerOffset = 0;
long consumerOffset = this.brokerController.getConsumerOffsetManager().queryOffset(//
group, //
topic, //
long consumerOffset = this.brokerController.getConsumerOffsetManager().queryOffset(
group,
topic,
i);
if (consumerOffset < 0)
consumerOffset = 0;
Expand Down Expand Up @@ -1215,10 +1208,10 @@ private HashMap<String, String> prepareRuntimeInfo() {
return runtimeInfo;
}

private RemotingCommand callConsumer(//
final int requestCode, //
final RemotingCommand request, //
final String consumerGroup, //
private RemotingCommand callConsumer(
final int requestCode,
final RemotingCommand request,
final String consumerGroup,
final String clientId) throws RemotingCommandException {
final RemotingCommand response = RemotingCommand.createResponseCommand(null);
ClientChannelInfo clientChannelInfo = this.brokerController.getConsumerManager().findChannel(consumerGroup, clientId);
Expand All @@ -1231,8 +1224,8 @@ private RemotingCommand callConsumer(//

if (clientChannelInfo.getVersion() < MQVersion.Version.V3_1_8_SNAPSHOT.ordinal()) {
response.setCode(ResponseCode.SYSTEM_ERROR);
response.setRemark(String.format("The Consumer <%s> Version <%s> too low to finish, please upgrade it to V3_1_8_SNAPSHOT", //
clientId, //
response.setRemark(String.format("The Consumer <%s> Version <%s> too low to finish, please upgrade it to V3_1_8_SNAPSHOT",
clientId,
MQVersion.getVersionDesc(clientChannelInfo.getVersion())));
return response;
}
Expand Down
16 changes: 8 additions & 8 deletions broker/src/main/java/org/apache/rocketmq/broker/processor/PullMessageProcessor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ private RemotingCommand processRequest(final Channel channel, RemotingCommand re
assert consumerFilterData != null;
}
} catch (Exception e) {
log.warn("Parse the consumer's subscription[{}] failed, group: {}", requestHeader.getSubscription(), //
log.warn("Parse the consumer's subscription[{}] failed, group: {}", requestHeader.getSubscription(),
requestHeader.getConsumerGroup());
response.setCode(ResponseCode.SUBSCRIPTION_PARSE_FAILED);
response.setRemark("parse the consumer's subscription failed");
Expand All @@ -176,7 +176,7 @@ private RemotingCommand processRequest(final Channel channel, RemotingCommand re
return response;
}

if (!subscriptionGroupConfig.isConsumeBroadcastEnable() //
if (!subscriptionGroupConfig.isConsumeBroadcastEnable()
&& consumerGroupInfo.getMessageModel() == MessageModel.BROADCASTING) {
response.setCode(ResponseCode.NO_PERMISSION);
response.setRemark("the consumer group[" + requestHeader.getConsumerGroup() + "] can not consume by broadcast way");
Expand Down Expand Up @@ -285,12 +285,12 @@ private RemotingCommand processRequest(final Channel channel, RemotingCommand re
response.setCode(ResponseCode.PULL_OFFSET_MOVED);

// XXX: warn and notify me
log.info("the broker store no queue data, fix the request offset {} to {}, Topic: {} QueueId: {} Consumer Group: {}", //
requestHeader.getQueueOffset(), //
getMessageResult.getNextBeginOffset(), //
requestHeader.getTopic(), //
requestHeader.getQueueId(), //
requestHeader.getConsumerGroup()//
log.info("the broker store no queue data, fix the request offset {} to {}, Topic: {} QueueId: {} Consumer Group: {}",
requestHeader.getQueueOffset(),
getMessageResult.getNextBeginOffset(),
requestHeader.getTopic(),
requestHeader.getQueueId(),
requestHeader.getConsumerGroup()
);
} else {
response.setCode(ResponseCode.PULL_NOT_FOUND);
Expand Down
Loading

0 comments on commit 7f96008

Please sign in to comment.