Skip to content

Commit c469a60

Browse files
committed
Remove the filter server module
1 parent c3ada73 commit c469a60

File tree

5 files changed

+2
-250
lines changed

5 files changed

+2
-250
lines changed

broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
*/
1717
package org.apache.rocketmq.broker;
1818

19+
import com.google.common.collect.Lists;
1920
import java.io.IOException;
2021
import java.net.InetSocketAddress;
2122
import java.util.ArrayList;
@@ -44,7 +45,6 @@
4445
import org.apache.rocketmq.broker.dledger.DLedgerRoleChangeHandler;
4546
import org.apache.rocketmq.broker.filter.CommitLogDispatcherCalcBitMap;
4647
import org.apache.rocketmq.broker.filter.ConsumerFilterManager;
47-
import org.apache.rocketmq.broker.filtersrv.FilterServerManager;
4848
import org.apache.rocketmq.broker.latency.BrokerFastFailure;
4949
import org.apache.rocketmq.broker.latency.BrokerFixedThreadPoolExecutor;
5050
import org.apache.rocketmq.broker.longpolling.LmqPullRequestHoldService;
@@ -145,7 +145,6 @@ public class BrokerController {
145145
private final BlockingQueue<Runnable> heartbeatThreadPoolQueue;
146146
private final BlockingQueue<Runnable> consumerManagerThreadPoolQueue;
147147
private final BlockingQueue<Runnable> endTransactionThreadPoolQueue;
148-
private final FilterServerManager filterServerManager;
149148
private final BrokerStatsManager brokerStatsManager;
150149
private final List<SendMessageHook> sendMessageHookList = new ArrayList<SendMessageHook>();
151150
private final List<ConsumeMessageHook> consumeMessageHookList = new ArrayList<ConsumeMessageHook>();
@@ -198,7 +197,6 @@ public BrokerController(
198197
this.broker2Client = new Broker2Client(this);
199198
this.subscriptionGroupManager = messageStoreConfig.isEnableLmq() ? new LmqSubscriptionGroupManager(this) : new SubscriptionGroupManager(this);
200199
this.brokerOuterAPI = new BrokerOuterAPI(nettyClientConfig);
201-
this.filterServerManager = new FilterServerManager(this);
202200

203201
this.slaveSynchronize = new SlaveSynchronize(this);
204202

@@ -802,10 +800,6 @@ public void shutdown() {
802800

803801
this.consumerOffsetManager.persist();
804802

805-
if (this.filterServerManager != null) {
806-
this.filterServerManager.shutdown();
807-
}
808-
809803
if (this.brokerFastFailure != null) {
810804
this.brokerFastFailure.shutdown();
811805
}
@@ -879,10 +873,6 @@ public void start() throws Exception {
879873
this.clientHousekeepingService.start();
880874
}
881875

882-
if (this.filterServerManager != null) {
883-
this.filterServerManager.start();
884-
}
885-
886876
if (!messageStoreConfig.isEnableDLegerCommitLog()) {
887877
startProcessorByHa(messageStoreConfig.getBrokerRole());
888878
handleSlaveSynchronize(messageStoreConfig.getBrokerRole());
@@ -963,7 +953,7 @@ private void doRegisterBrokerAll(boolean checkOrderConfig, boolean oneway,
963953
this.brokerConfig.getBrokerId(),
964954
this.getHAServerAddr(),
965955
topicConfigWrapper,
966-
this.filterServerManager.buildNewFilterServerList(),
956+
Lists.newArrayList(),
967957
oneway,
968958
this.brokerConfig.getRegisterBrokerTimeoutMills(),
969959
this.brokerConfig.isCompressedRegister());
@@ -1034,10 +1024,6 @@ public BlockingQueue<Runnable> getSendThreadPoolQueue() {
10341024
return sendThreadPoolQueue;
10351025
}
10361026

1037-
public FilterServerManager getFilterServerManager() {
1038-
return filterServerManager;
1039-
}
1040-
10411027
public BrokerStatsManager getBrokerStatsManager() {
10421028
return brokerStatsManager;
10431029
}

broker/src/main/java/org/apache/rocketmq/broker/client/ClientHousekeepingService.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ public void run() {
5555
private void scanExceptionChannel() {
5656
this.brokerController.getProducerManager().scanNotActiveChannel();
5757
this.brokerController.getConsumerManager().scanNotActiveChannel();
58-
this.brokerController.getFilterServerManager().scanNotActiveChannel();
5958
}
6059

6160
public void shutdown() {
@@ -71,20 +70,17 @@ public void onChannelConnect(String remoteAddr, Channel channel) {
7170
public void onChannelClose(String remoteAddr, Channel channel) {
7271
this.brokerController.getProducerManager().doChannelCloseEvent(remoteAddr, channel);
7372
this.brokerController.getConsumerManager().doChannelCloseEvent(remoteAddr, channel);
74-
this.brokerController.getFilterServerManager().doChannelCloseEvent(remoteAddr, channel);
7573
}
7674

7775
@Override
7876
public void onChannelException(String remoteAddr, Channel channel) {
7977
this.brokerController.getProducerManager().doChannelCloseEvent(remoteAddr, channel);
8078
this.brokerController.getConsumerManager().doChannelCloseEvent(remoteAddr, channel);
81-
this.brokerController.getFilterServerManager().doChannelCloseEvent(remoteAddr, channel);
8279
}
8380

8481
@Override
8582
public void onChannelIdle(String remoteAddr, Channel channel) {
8683
this.brokerController.getProducerManager().doChannelCloseEvent(remoteAddr, channel);
8784
this.brokerController.getConsumerManager().doChannelCloseEvent(remoteAddr, channel);
88-
this.brokerController.getFilterServerManager().doChannelCloseEvent(remoteAddr, channel);
8985
}
9086
}

broker/src/main/java/org/apache/rocketmq/broker/filtersrv/FilterServerManager.java

Lines changed: 0 additions & 167 deletions
This file was deleted.

broker/src/main/java/org/apache/rocketmq/broker/filtersrv/FilterServerUtil.java

Lines changed: 0 additions & 42 deletions
This file was deleted.

broker/src/main/java/org/apache/rocketmq/broker/processor/AdminBrokerProcessor.java

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,6 @@
101101
import org.apache.rocketmq.common.protocol.header.SearchOffsetResponseHeader;
102102
import org.apache.rocketmq.common.protocol.header.UpdateGlobalWhiteAddrsConfigRequestHeader;
103103
import org.apache.rocketmq.common.protocol.header.ViewBrokerStatsDataRequestHeader;
104-
import org.apache.rocketmq.common.protocol.header.filtersrv.RegisterFilterServerRequestHeader;
105-
import org.apache.rocketmq.common.protocol.header.filtersrv.RegisterFilterServerResponseHeader;
106104
import org.apache.rocketmq.common.protocol.heartbeat.SubscriptionData;
107105
import org.apache.rocketmq.common.stats.StatsItem;
108106
import org.apache.rocketmq.common.stats.StatsSnapshot;
@@ -203,8 +201,6 @@ public RemotingCommand processRequest(ChannelHandlerContext ctx,
203201
return this.getConsumerStatus(ctx, request);
204202
case RequestCode.QUERY_TOPIC_CONSUME_BY_WHO:
205203
return this.queryTopicConsumeByWho(ctx, request);
206-
case RequestCode.REGISTER_FILTER_SERVER:
207-
return this.registerFilterServer(ctx, request);
208204
case RequestCode.QUERY_CONSUME_TIME_SPAN:
209205
return this.queryConsumeTimeSpan(ctx, request);
210206
case RequestCode.GET_SYSTEM_TOPIC_LIST_FROM_BROKER:
@@ -1092,23 +1088,6 @@ private RemotingCommand queryTopicConsumeByWho(ChannelHandlerContext ctx,
10921088
return response;
10931089
}
10941090

1095-
private RemotingCommand registerFilterServer(ChannelHandlerContext ctx,
1096-
RemotingCommand request) throws RemotingCommandException {
1097-
final RemotingCommand response = RemotingCommand.createResponseCommand(RegisterFilterServerResponseHeader.class);
1098-
final RegisterFilterServerResponseHeader responseHeader = (RegisterFilterServerResponseHeader) response.readCustomHeader();
1099-
final RegisterFilterServerRequestHeader requestHeader =
1100-
(RegisterFilterServerRequestHeader) request.decodeCommandCustomHeader(RegisterFilterServerRequestHeader.class);
1101-
1102-
this.brokerController.getFilterServerManager().registerFilterServer(ctx.channel(), requestHeader.getFilterServerAddr());
1103-
1104-
responseHeader.setBrokerId(this.brokerController.getBrokerConfig().getBrokerId());
1105-
responseHeader.setBrokerName(this.brokerController.getBrokerConfig().getBrokerName());
1106-
1107-
response.setCode(ResponseCode.SUCCESS);
1108-
response.setRemark(null);
1109-
return response;
1110-
}
1111-
11121091
private RemotingCommand queryConsumeTimeSpan(ChannelHandlerContext ctx,
11131092
RemotingCommand request) throws RemotingCommandException {
11141093
final RemotingCommand response = RemotingCommand.createResponseCommand(null);

0 commit comments

Comments
 (0)